Mercurial > mxe-octave

annotate src/of-fits-1-fixes.patch @ 3578:583d3bf548e6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
texinfo: update to 5.2 and install all tools * src/texinfo.mk: update to 5.2 and make/make install all. * src/texinfo-1-fixes.patch: updated patch for 5.2.
author John Donoghue <john.donoghue@ieee.org>
date Tue, 15 Apr 2014 21:32:17 -0400
parents 3d24cec05900
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
3414
3d24cec05900 Add octave forge fits package
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
1 diff -ur fits.orig/src/Makefile fits/src/Makefile
3d24cec05900 Add octave forge fits package
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
2 --- fits.orig/src/Makefile 2014-01-12 00:19:31.000000000 -0500
3d24cec05900 Add octave forge fits package
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
3 +++ fits/src/Makefile 2014-01-12 00:52:57.000000000 -0500
3d24cec05900 Add octave forge fits package
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
4 @@ -1,4 +1,4 @@
3d24cec05900 Add octave forge fits package
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
5 -MKOCT_FLAGS = $(shell pkg-config --libs cfitsio)
3d24cec05900 Add octave forge fits package
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
6 +MKOCT_FLAGS = $(shell pkg-config --libs --cflags cfitsio)
3d24cec05900 Add octave forge fits package
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
7
3d24cec05900 Add octave forge fits package
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
8 all: read_fits_image.oct save_fits_image.oct save_fits_image_multi_ext.oct
3d24cec05900 Add octave forge fits package
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
9
3d24cec05900 Add octave forge fits package
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
10 diff -ur fits.orig/src/read_fits_image.cc fits/src/read_fits_image.cc
3d24cec05900 Add octave forge fits package
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
11 --- fits.orig/src/read_fits_image.cc 2014-01-12 00:19:31.000000000 -0500
3d24cec05900 Add octave forge fits package
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
12 +++ fits/src/read_fits_image.cc 2014-01-12 00:51:26.000000000 -0500
3d24cec05900 Add octave forge fits package
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
13 @@ -136,7 +136,7 @@
3d24cec05900 Add octave forge fits package
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
14 }
3d24cec05900 Add octave forge fits package
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
15 //std::cerr << "read_sz: " << read_sz << std::endl;
3d24cec05900 Add octave forge fits package
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
16
3d24cec05900 Add octave forge fits package
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
17 - #if OCTAVE_API_VERSION_NUMBER >= 45
3d24cec05900 Add octave forge fits package
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
18 + #if ! defined OCTAVE_API_VERSION_NUMBER || OCTAVE_API_VERSION_NUMBER >= 45
3d24cec05900 Add octave forge fits package
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
19 MArray<double> image_data( dims ); // a octace double-type array
3d24cec05900 Add octave forge fits package
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
20 #else
3d24cec05900 Add octave forge fits package
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
21 MArrayN<double> image_data( dims ); // a octave double-type array