Changeset 12405

Timestamp:

Mar 12, 2007, 10:46:45 AM (19 years ago)

Author:

gusciora

Message:

Fixed divide-by-zero code

File:

• trunk/psLib/test/imageops/tap_psImagePixelManip.c (modified) (4 diffs)

trunk/psLib/test/imageops/tap_psImagePixelManip.c

@@ -6 +6 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-02-27 23:56:12 $
+ *  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-03-12 20:46:45 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -16 +16 @@
 #include "tap.h"
 #include "pstap.h"
+#define VERBOSE false
 
 psS32 main(psS32 argc, char* argv[])
@@ -21 +22 @@
     psLogSetFormat("HLNM");
     psLogSetLevel(PS_LOG_INFO);
-    plan_tests(85);
+    plan_tests(86);
 
     // testImageClip()
@@ -696 +697 @@
         }
         retVal = psImageOverlaySection(img,img2,0,0,"/");
-        ok(retVal == 0, "psImageOverlaySection returned zero when checking divide-by-zero");
-        printf("XXX: retVal is %d, should be 0\n", retVal);
+        ok(retVal != 0, "psImageOverlaySection returned non-zero when checking divide-by-zero");
+        errorFlag = false;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+        for (unsigned row=0;row<r;row++)
+        {
+            for (unsigned col=0;col<c;col++) {
+                if (!isnan(img->data.F32[row][col])) {
+                    if (VERBOSE) diag("img[%d][%d] is %f, should be NAN\n", row, col, img->data.F32[row][col]);
+                    errorFlag = true;
+                }
+            }
+        }
+        ok(!errorFlag, "psImageOverlaySection() properly set data to NANs");
+
         psFree(img);
         psFree(img2);