Mercurial > mxe-octave
view src/of-fits-2-fixes.patch @ 5571:b19fb3ed330c
use cmake command line to set build shared/static options (bug #59373)
* Makefile.in (CMAKE_BUILD_SHARED_OR_STATIC): New variable.
(build-cmake-toolchain-file): Don't define BUILD_SHARED_LIBS or
BUILD_STATIC_LIBS in the toolchain file.
* armadillo.mk, cgal.mk, cmake.mk, cminpack.mk, double-conversion.mk,
eigen.mk, gdcm.mk, gl2ps.mk, hdf5.mk, lapack.mk, libical.mk,
libproxy.mk, of-dicom.mk, openal.mk, opencv.mk, openexr.mk,
openscenegraph.mk, physfs.mk, qhull.mk, qjson.mk, rapidjson.mk,
suitesparse.mk, sundials-ida.mk, taglib.mk, vigra.mk, vmime.mk,
vtk.mk, wt.mk: Use $(CMAKE_BUILD_SHARED_OR_STATIC) on the cmake
command line.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Fri, 30 Oct 2020 10:06:00 -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;