Changeset 41474 for trunk/Ohana/src/libfits/test/imagecomp.c

Timestamp:

Jan 24, 2021, 3:37:52 PM (5 years ago)

Author:

eugene

Message:

clarify in comments the buffers and pixel sizes used in the different stages of compression/uncompression; catch unimplemented compression cases; fix error in pixel size for RICE1; cleanup verbose code; use correct sscanf format code in ASCII table reading code

File:

• trunk/Ohana/src/libfits/test/imagecomp.c (modified) (5 diffs)

trunk/Ohana/src/libfits/test/imagecomp.c

@@ -3 +3 @@
 # include "tap_ohana.h"
 
+# define MEM_VERBOSE FALSE
+
 int test_compress (int bitpix, char *zcmptype);
 int test_compress_fullrange (int bitpix, char *zcmptype);
 int test_compress_fulltile (int bitpix, char *zcmptype);
 
-// char *cmptype[] = {"NONE", "NONE_2", "GZIP_1", "GZIP_2", "PLIO_1", "RICE_1", "RICE_ONE", "HCOMPRESS_1", NULL};
+// XXX FULL SET : char *cmptype[] = {"NONE", "NONE_2", "GZIP_1", "GZIP_2", "PLIO_1", "RICE_1", "RICE_ONE", "HCOMPRESS_1", NULL};
 char *cmptype[] = {"NONE", "NONE_1", "NONE_2", "GZIP_1", "GZIP_2", "RICE_1", "RICE_ONE", NULL};
+// XXX NOT WORKING: char *cmptype[] = {"HCOMPRESS_1", NULL};
 int bitpix[] = {8, 16, 32, -32, -64, 0};
 
@@ -31 +34 @@
       test_compress_fulltile (bitpix[j], cmptype[i]);
       test_compress_fullrange (bitpix[j], cmptype[i]);
-      ok (ohana_memcheck (TRUE), "no memory corruption");
+      ok (ohana_memcheck (MEM_VERBOSE), "no memory corruption");
     }
   }
@@ -43 +46 @@
       test_compress_fulltile (bitpix[j], cmptype[i]);
       test_compress_fullrange (bitpix[j], cmptype[i]);
-      ok (ohana_memcheck (TRUE), "no memory corruption");
+      ok (ohana_memcheck (MEM_VERBOSE), "no memory corruption");
     }
   }
@@ -55 +58 @@
       test_compress_fulltile (bitpix[j], cmptype[i]);
       test_compress_fullrange (bitpix[j], cmptype[i]);
-      ok (ohana_memcheck (TRUE), "no memory corruption");
+      ok (ohana_memcheck (MEM_VERBOSE), "no memory corruption");
     }
   }
@@ -138 +141 @@
   }     
   
+  // diag ("--- Image has a total of %d pixels of which %d are bad ---", NX*NY, Nbad);
   ok (!Nbad, "all image pixels match");