Changeset 5214 for trunk/psLib/test/types

Timestamp:

Sep 30, 2005, 2:14:17 PM (21 years ago)

Author:

drobbin

Message:

Changed psPixelCoord to use float's instead of int's

File:

• trunk/psLib/test/types/tst_psPixels.c (modified) (10 diffs)

trunk/psLib/test/types/tst_psPixels.c

@@ -5 +5 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.2 $
+ *  @version $Revision: 1.3 $
  *           $Name: not supported by cvs2svn $
- *  @date $Date: 2005-09-23 00:04:36 $
+ *  @date $Date: 2005-10-01 00:14:17 $
  *
  *  Copyright 2005 Maui High Performance Computing Center, University of Hawaii
@@ -88 +88 @@
     if (p1->n != p1->nalloc) {
         psError(PS_ERR_UNKNOWN, true,
-                "psPixelsAlloc failed to set n = %d", p1->nalloc);
+                "psPixelsAlloc failed to set n = %ld", p1->nalloc);
         return 13;
     }
     if (p1->nalloc != 1) {
         psError(PS_ERR_UNKNOWN, true,
-                "psPixelsAlloc failed to set nalloc = 1 (%d)",
+                "psPixelsAlloc failed to set nalloc = 1 (%ld)",
                 p1->nalloc);
         return 14;
@@ -117 +117 @@
     if (p2->n != p2->nalloc) {
         psError(PS_ERR_UNKNOWN, true,
-                "psPixelsAlloc failed to set n = %d", p2->nalloc);
+                "psPixelsAlloc failed to set n = %ld", p2->nalloc);
         return 13;
     }
     if (p2->nalloc != 10) {
         psError(PS_ERR_UNKNOWN, true,
-                "psPixelsAlloc failed to set nalloc = 1 (%d)",
+                "psPixelsAlloc failed to set nalloc = 1 (%ld)",
                 p2->nalloc);
         return 14;
@@ -192 +192 @@
         if (p0->data[i].x != i || p0->data[i].y != 100+i) {
             psError(PS_ERR_UNKNOWN, true,
-                    "The value of pixel %d was not preserved (%d,%d) vs (%d,%d).",
+                    "The value of pixel %d was not preserved (%f,%f) vs (%d,%d).",
                     i, p0->data[i].x, p0->data[i].y, i, 100+i);
             return 15;
@@ -284 +284 @@
         return 3;
     }
-    for (int i = 0; i < out1->n; i++) {
+    for (long i = 0; i < out1->n; i++) {
         if (out1->data[i].x != in1->data[i].x || out1->data[i].y != in1->data[i].y) {
             psError(PS_ERR_UNKNOWN, true,
-                    "failed to copy the values correctly at index %d", i);
+                    "failed to copy the values correctly at index %ld", i);
             return 4;
         }
@@ -402 +402 @@
     if (pixels->n != numRows) {
         psError(PS_ERR_UNKNOWN, false,
-                "wrong number of pixels in list.  Got %d, should be %d.",
+                "wrong number of pixels in list.  Got %ld, should be %d.",
                 pixels->n, numRows);
         return 2;
     }
 
-    for (int i = 0; i < pixels->n; i++) {
-        if (mask->data.PS_TYPE_MASK_DATA[pixels->data[i].y][pixels->data[i].x] != 1) {
+    for (long i = 0; i < pixels->n; i++) {
+        if (mask->data.PS_TYPE_MASK_DATA[(int)pixels->data[i].y][(int)pixels->data[i].x] != 1) {
             psError(PS_ERR_UNKNOWN, false,
-                    "Item in psPixels list (%d,%d) didn't coorespond to a masked value in image",
+                    "Item in psPixels list (%f,%f) didn't coorespond to a masked value in image",
                     pixels->data[i].x, pixels->data[i].y);
             return 3;
@@ -468 +468 @@
         return 3;
     }
-    for (int i = 0; i < pixels2->n; i++) {
+    for (long i = 0; i < pixels2->n; i++) {
         if (pixels2->data[i].x != pixels->data[i].x || pixels2->data[i].y != pixels->data[i].y) {
             psError(PS_ERR_UNKNOWN, true,
-                    "failed to copy the values correctly at index %d", i);
+                    "failed to copy the values correctly at index %ld", i);
             return 4;
         }
@@ -486 +486 @@
     if (pixels3->n != 15) {
         psError(PS_ERR_UNKNOWN, true,
-                "pixels3->n != 15, == %d", pixels3->n);
+                "pixels3->n != 15, == %ld", pixels3->n);
         return 11;
     }
@@ -526 +526 @@
     out = psPixelsGet(in, 1);
     if ( out.x != 3 || out.y != 13 ) {
-        psError(PS_ERR_BAD_PARAMETER_VALUE, true, "psPixelsGet return incorrect values %d,%d",
+        psError(PS_ERR_BAD_PARAMETER_VALUE, true, "psPixelsGet return incorrect values %f,%f",
                 out.x, out.y);
         return 4;
@@ -538 +538 @@
     out = psPixelsGet(in, 0);
     if (out.x != 1 || out.y != 2) {
-        psError(PS_ERR_BAD_PARAMETER_VALUE, true, "psPixelsGet return incorrect values %d,%d",
+        psError(PS_ERR_BAD_PARAMETER_VALUE, true, "psPixelsGet return incorrect values %f,%f",
                 out.x, out.y);
         return 6;