Changeset 12512 for trunk/psLib/test/types

Timestamp:

Mar 19, 2007, 5:31:39 PM (19 years ago)

Author:

jhoblitt

Message:

silence warnings

File:

• trunk/psLib/test/types/tap_psPixels_all.c (modified) (4 diffs)

trunk/psLib/test/types/tap_psPixels_all.c

@@ -273 +273 @@
     }
 
-    psPixels *outPixels = NULL;
-    {
+    {
+        psPixels *outPixels = NULL;
         outPixels = psPixelsFromMask(outPixels, outImage, maskVal);
         ok ( outPixels != NULL,
@@ -281 +281 @@
     }
 
-    //Return NULL for NULL image input
-    {
-        psPixels *outPixels = psPixelsFromMask(outPixels, NULL, maskVal);
+    // Return NULL for NULL image input
+    {
+        psPixels *outPixels = NULL;
+        outPixels = psPixelsFromMask(outPixels, NULL, maskVal);
         ok ( outPixels == NULL,
              "psPixelsFromMask:     return NULL for NULL image input.");
     }
-    //Return NULL for image with wrong maskType
+
+    // Return NULL for image with wrong maskType
     *(psElemType*)&(outImage->type.type) = PS_TYPE_U32;
     {
-        psPixels *outPixels = psPixelsFromMask(outPixels, outImage, maskVal);
+        psPixels *outPixels = NULL;
+        outPixels = psPixelsFromMask(outPixels, outImage, maskVal);
         ok ( outPixels == NULL,
              "psPixelsFromMask:     return NULL for image with wrong maskType.");
     }
 
-    //psPixelsConcatenate Tests
-    //Return NULL for NULL pixels input
-    {
-        psPixels *outPixels = psPixelsConcatenate(outPixels, NULL);
+    // psPixelsConcatenate Tests
+    // Return NULL for NULL pixels input
+    {
+        psPixels *outPixels = NULL;
+        outPixels = psPixelsConcatenate(outPixels, NULL);
         ok ( outPixels == NULL,
              "psPixelsConcatenate:  return NULL for NULL pixels input.");
@@ -306 +310 @@
     //Return copy of input pixels for NULL out pixels
     {
+        psPixels *outPixels = NULL;
         outPixels = psPixelsFromMask(outPixels, outImage, maskVal);
         outPixels = psPixelsConcatenate(outPixels, p0);
@@ -313 +318 @@
         psFree(outPixels);
     }
+
     //Return properly concatenated psPixels list
     //Set all the compare cases to cover 'comparePixelCoord' as well.
-    outPixels = psPixelsAlloc(5);
+    psPixels *outPixels = psPixelsAlloc(5);
     in.x = 1.0;
     in.y = 1.0;