Mercurial > mxe-octave
view src/of-fits-2-fixes.patch @ 5094:ca7d09e9d8c3
* installer-files/octave.bat: add missing \ from msys path
author | John Donoghue |
---|---|
date | Wed, 12 Jun 2019 12:26:26 -0400 |
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;