Mercurial > mxe-octave

view src/of-fits-1-fixes.patch @ 3589:780be3cf5995

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
gcc-*: pcre=8.35, cloog=0.18.1, gmp=6.0.0, isl=0.12.2 * src/cloog.mk: update version 0.18.1. * src/gmp.mk: update version 6.0.0. * src/isl.mk: update version 0.12.2. * src/isl-1-fixes.patch: update patch for -no-undefined
author John Donoghue
date Fri, 25 Apr 2014 14:44:56 -0400
parents 3d24cec05900
children
line wrap: on
line source

diff -ur fits.orig/src/Makefile fits/src/Makefile
--- fits.orig/src/Makefile	2014-01-12 00:19:31.000000000 -0500
+++ fits/src/Makefile	2014-01-12 00:52:57.000000000 -0500
@@ -1,4 +1,4 @@
-MKOCT_FLAGS = $(shell pkg-config --libs cfitsio)
+MKOCT_FLAGS = $(shell pkg-config --libs --cflags cfitsio)
 
 all: read_fits_image.oct save_fits_image.oct save_fits_image_multi_ext.oct
 
diff -ur fits.orig/src/read_fits_image.cc fits/src/read_fits_image.cc
--- fits.orig/src/read_fits_image.cc	2014-01-12 00:19:31.000000000 -0500
+++ fits/src/read_fits_image.cc	2014-01-12 00:51:26.000000000 -0500
@@ -136,7 +136,7 @@
   }
   //std::cerr << "read_sz: " << read_sz << std::endl;
 
-  #if OCTAVE_API_VERSION_NUMBER >= 45 
+  #if ! defined OCTAVE_API_VERSION_NUMBER || OCTAVE_API_VERSION_NUMBER >= 45 
     MArray<double> image_data( dims ); // a octace double-type array
   #else
     MArrayN<double> image_data( dims ); // a octave double-type array