Mercurial > mxe-octave
view src/of-fits-2-fixes.patch @ 5531:eae508c12529
Add build rule for build-octave (bug #49503).
* src/build-octave.mk: Add new build rule for build-octave which can be used for
cross-building binary packages that depend on Octave as a build tool.
* dist-files.mk: Add new file to list.
* index.html: Add new package to list.
* src/of-communications.mk, src/of-image.mk, src/of-mapping.mk,
src/of-optiminterp.mk, src/of-sparsersb.mk, src/of-statistics.mk,
src/of-windows.mk: Add optional dependency on build-octave.
* configure.ac: Add new configure switch "--disable-system-octave" that is
needed to build the build-octave package.
* Makefile.in: Add variable "USE_SYSTEM_OCTAVE". Exclude build-octave from the
default build tools and build it only if a package explicitly depends on it.
Display warning about missing native Octave version only if necessary.
| author | Markus Mützel <markus.muetzel@gmx.de> |
|---|---|
| date | Tue, 08 Sep 2020 23:04:38 +0200 |
| parents | 00e61c4a5657 |
| children |
line wrap: on
line source
diff -uNr a/src/read_fits_image.cc b/src/read_fits_image.cc --- a/src/read_fits_image.cc 2015-06-11 07:19:38.000000000 -0400 +++ b/src/read_fits_image.cc 2018-04-09 14:31:49.259838178 -0400 @@ -194,7 +194,7 @@ return true; } double val = args(1).double_value(); - if( (D_NINT( val ) != val) || (val < 0) ) + if( (octave::math::x_nint( val ) != val) || (val < 0) ) { error( "read_fits_image: second argument must be a non-negative scalar integer value" ); return true; diff -uNr a/src/save_fits_image.cc b/src/save_fits_image.cc --- a/src/save_fits_image.cc 2015-06-11 07:19:38.000000000 -0400 +++ b/src/save_fits_image.cc 2018-04-09 14:31:37.948365332 -0400 @@ -81,7 +81,7 @@ else if( args(2).is_scalar_type() ) { double val = args(2).double_value(); - if( (D_NINT( val ) == val) ) + if( (octave::math::x_nint( val ) == val) ) { if( BYTE_IMG == val ) bitperpixel = BYTE_IMG; diff -uNr a/src/save_fits_image_multi_ext.cc b/src/save_fits_image_multi_ext.cc --- a/src/save_fits_image_multi_ext.cc 2015-06-11 07:19:38.000000000 -0400 +++ b/src/save_fits_image_multi_ext.cc 2018-04-09 14:34:46.915556809 -0400 @@ -78,7 +78,7 @@ else if( args(2).is_scalar_type() ) { double val = args(2).double_value(); - if( (D_NINT( val ) == val) ) + if( (octave::math::x_nint( val ) == val) ) { if( BYTE_IMG == val ) bitperpixel = BYTE_IMG;