Mercurial > mxe-octave

comparison src/of-fits-2-fixes.patch @ 4653:00e61c4a5657

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fixes for package build errors due to API changes
author John W. Eaton <jwe@octave.org>
date Mon, 09 Apr 2018 12:12:44 -0400
parents
children
comparison
equal deleted inserted replaced
4652:2f14bc0c6d0c 4653:00e61c4a5657
1 diff -uNr a/src/read_fits_image.cc b/src/read_fits_image.cc
2 --- a/src/read_fits_image.cc 2015-06-11 07:19:38.000000000 -0400
3 +++ b/src/read_fits_image.cc 2018-04-09 14:31:49.259838178 -0400
4 @@ -194,7 +194,7 @@
5 return true;
6 }
7 double val = args(1).double_value();
8 - if( (D_NINT( val ) != val) || (val < 0) )
9 + if( (octave::math::x_nint( val ) != val) || (val < 0) )
10 {
11 error( "read_fits_image: second argument must be a non-negative scalar integer value" );
12 return true;
13 diff -uNr a/src/save_fits_image.cc b/src/save_fits_image.cc
14 --- a/src/save_fits_image.cc 2015-06-11 07:19:38.000000000 -0400
15 +++ b/src/save_fits_image.cc 2018-04-09 14:31:37.948365332 -0400
16 @@ -81,7 +81,7 @@
17 else if( args(2).is_scalar_type() )
18 {
19 double val = args(2).double_value();
20 - if( (D_NINT( val ) == val) )
21 + if( (octave::math::x_nint( val ) == val) )
22 {
23 if( BYTE_IMG == val )
24 bitperpixel = BYTE_IMG;
25 diff -uNr a/src/save_fits_image_multi_ext.cc b/src/save_fits_image_multi_ext.cc
26 --- a/src/save_fits_image_multi_ext.cc 2015-06-11 07:19:38.000000000 -0400
27 +++ b/src/save_fits_image_multi_ext.cc 2018-04-09 14:34:46.915556809 -0400
28 @@ -78,7 +78,7 @@
29 else if( args(2).is_scalar_type() )
30 {
31 double val = args(2).double_value();
32 - if( (D_NINT( val ) == val) )
33 + if( (octave::math::x_nint( val ) == val) )
34 {
35 if( BYTE_IMG == val )
36 bitperpixel = BYTE_IMG;