Changeset 17447 for trunk/psLib/src/fits

Timestamp:

Apr 17, 2008, 1:43:03 PM (18 years ago)

Author:

jhoblitt

Message:

convert assert() to psAssert()

Location:

trunk/psLib/src/fits

Files:

• psFitsFloat.c (modified) (1 diff)
• psFitsHeader.c (modified) (4 diffs)
• psFitsImage.c (modified) (5 diffs)
• psFitsScale.c (modified) (2 diffs)

trunk/psLib/src/fits/psFitsFloat.c

@@ -153 +153 @@
             return NULL;
         }
-        assert(out->type.type == PS_TYPE_F32);
+        psAssert(out->type.type == PS_TYPE_F32, "impossible");
         for (int y = 0; y < numRows; y++) {
             for (int x = 0; x < numCols; x++) {

trunk/psLib/src/fits/psFitsHeader.c

@@ -7 +7 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.43 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2008-03-19 20:23:06 $
+ *  @version $Revision: 1.44 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2008-04-17 23:43:02 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -21 +21 @@
 #include <strings.h>
 
+#include "psAbort.h"
 #include "psAssert.h"
 #include "psFits.h"
@@ -230 +231 @@
                               )
 {
-    assert(fits);
+    psAssert(fits, "impossible");
 
     psMetadata *header = psMetadataAlloc(); // Header, to return
@@ -414 +415 @@
         // Need to look for MULTI, which won't be picked up using the iterator.
         psMetadataItem *multiCheckItem = psMetadataLookup(header, item->name);
-        assert(multiCheckItem);
+        psAssert(multiCheckItem, "impossible");
         unsigned int flag = 0;      // Flag to indicate MULTI; otherwise default action
         if (multiCheckItem->type == PS_DATA_METADATA_MULTI) {

trunk/psLib/src/fits/psFitsImage.c

@@ -7 +7 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.27 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2008-03-11 19:57:41 $
+ *  @version $Revision: 1.28 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2008-04-17 23:43:02 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -253 +253 @@
                                           )
 {
-    assert(bscale);
-    assert(bzero);
-    assert(floatType);
-    assert(fits);
-    assert(image);
+    psAssert(bscale, "impossible");
+    psAssert(bzero, "impossible");
+    psAssert(floatType, "impossible");
+    psAssert(fits, "impossible");
+    psAssert(image, "impossible");
 
     *bscale = 1.0;
@@ -358 +358 @@
 {
     // n.b., this assumes contiguous image buffer
-    assert(output);
-    assert(fits);
-    assert(info);
-    assert(output->numCols == info->lastPixel[0] - info->firstPixel[0] + 1);
-    assert(output->numRows == info->lastPixel[1] - info->firstPixel[1] + 1); // Right size
-    assert(!output->parent);            // No parents means the buffer is contiguous
+    psAssert(output, "impossible");
+    psAssert(fits, "impossible");
+    psAssert(info, "impossible");
+    psAssert(output->numCols == info->lastPixel[0] - info->firstPixel[0] + 1, "impossible");
+    psAssert(output->numRows == info->lastPixel[1] - info->firstPixel[1] + 1, "impossible"); // Right size
+    psAssert(!output->parent, "impossible");            // No parents means the buffer is contiguous
 
     int anynull = 0;                    // Are there any NULLs in the data?
@@ -516 +516 @@
     if (cfitsioBzero != 0.0) {
         // p_psFitsTypeToCfitsio and imageToDiskRepresentation must not clash!
-        assert(bzero == 0.0 && bscale == 1.0);
+        psAssert(bzero == 0.0 && bscale == 1.0, "impossible");
         bscale = 1.0;
         bzero = cfitsioBzero;
     }
     psFitsOptions *options = fits->options; // FITS I/O options
-    assert(!options || bitPix == options->bitpix || options->bitpix == 0);
+    psAssert(!options || bitPix == options->bitpix || options->bitpix == 0, "impossible");
 
     int naxis = 3;                      // Number of axes
@@ -647 +647 @@
     if (cfitsioBzero != 0.0) {
         // p_psFitsTypeToCfitsio and imageToDiskRepresentation must not clash!
-        assert(bzero == 0.0 && bscale == 1.0);
+        psAssert(bzero == 0.0 && bscale == 1.0, "impossible");
         bscale = 1.0;
         bzero = cfitsioBzero;
     }
     psFitsOptions *options = fits->options; // FITS I/O options
-    assert(!options || bitPix == options->bitpix || options->bitpix == 0);
+    psAssert(!options || bitPix == options->bitpix || options->bitpix == 0, "impossible");
 
     //check to see if the HDU has the same datatype

trunk/psLib/src/fits/psFitsScale.c

@@ -41 +41 @@
     )
 {
-    assert(bscale);
-    assert(bzero);
-    assert(image);
-    assert(options);
+    psAssert(bscale, "impossible");
+    psAssert(bzero, "impossible");
+    psAssert(image, "impossible");
+    psAssert(options, "impossible");
 
     double range = pow(2.0, options->bitpix); // Range of values for target BITPIX
@@ -101 +101 @@
     )
 {
-    assert(bscale);
-    assert(bzero);
-    assert(image);
-    assert(options);
+    psAssert(bscale, "impossible");
+    psAssert(bzero, "impossible");
+    psAssert(image, "impossible");
+    psAssert(options, "impossible");
 
     // Measure the mean and stdev