Mercurial > mxe-octave
view src/of-fits-1-fixes.patch @ 3556:22b42ac3fd68
native-gcc: remove unintended changes to native-gcc.mk from cs b1ca68ddd02c
src/native-gcc.mk: remove changes of b1ca68ddd02c.
author | John Donoghue <john.donoghue@ieee.org> |
---|---|
date | Thu, 27 Feb 2014 06:36:03 -0500 |
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