Changeset 18408

Timestamp:

Jul 2, 2008, 2:07:38 PM (18 years ago)

Author:

Paul Price

Message:

I've been getting a flood of messages:

ffgcnn could not find column: UNCOMPRESSED_DATA
ffgcnn could not find column: ZSCALE
ffgcnn could not find column: ZZERO
ffgcnn could not find column: ZBLANK

when reading compressed images. I know that Steve and Bill have been
seeing this too.

I've tracked this down to ricecomp.h in Ohana, which defines a
function, ffpmsg, that conflicts with a function in cfitsio. The
cfitsio calls to ffpmsg were going to the Ohana version.

To get around this, I've changed the function definition to a macro so
there's no symbol to produce a conflict.

File:

• trunk/Ohana/src/libfits/extern/ricecomp.h (modified) (1 diff)

trunk/Ohana/src/libfits/extern/ricecomp.h

@@ -4 +4 @@
 // decompression.  In order to include this .c file (or future upgrades), we include our own
 // version of ricecomp.h (not the one available in the CFITSIO tree) and include it instead of
-// fitsio2.h.  This file defines our own version of ffpmsg.  
+// fitsio2.h.  This file defines our own version of ffpmsg.
 
-int ffpmsg (char *line) {
-    
-    fprintf (stderr, "%s\n", line);
-    return 1;
-}
+#define ffpmsg(MSG) fprintf(stderr, "%s\n", MSG)