view src/of-fits-2-fixes.patch @ 5499:be0a7ce498e6

Update mesa to version 20.0.8 (bug #58689). * src/mesa.mk: Update version and checksum. Add build-meson to dependecies. Update build rule to use meson and ninja as the build tools. * src/mesa-1-meson.patch: Add new patch. * src/mesa-1-fixes.patch: Remove old patch for the scons rule that is no longer needed. * dist-files.mk: Update file list. * src/build-mako.mk: Depend on and use python3. * src/build-markupsafe.mk: Depend on and use python3.
author Markus Mützel <markus.muetzel@gmx.de>
date Sun, 05 Jul 2020 20:58:57 +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;