Index: trunk/psLib/test/imageops/tap_psImageGeomManip.c
===================================================================
--- trunk/psLib/test/imageops/tap_psImageGeomManip.c	(revision 21169)
+++ trunk/psLib/test/imageops/tap_psImageGeomManip.c	(revision 42822)
@@ -528,6 +528,4 @@
 
         psImage *in;
-        psImage *out;
-        psImage *out2;
         psS32 rows = 64;
         psS32 cols = 64;
@@ -544,5 +542,5 @@
         // Verify the returned psImage structure pointer is NULL and program
         // execution doesn't stop, if input parameter input is NULL.
-        out2 = psImageRoll(NULL,NULL,0,0);
+        psImage *out2 = psImageRoll(NULL,NULL,0,0);
         if (out2 != NULL) {
             psError(PS_ERR_UNKNOWN, true,"psImageRoll did not return NULL though input image was NULL!?");
@@ -551,7 +549,7 @@
 
         psFree(in);
-        psFree(out);
-
-        #define testRollType(DATATYPE) \
+        psFree(out2);
+
+#define testRollType(DATATYPE) { 			   \
         in = psImageAlloc(rows1,cols1,PS_TYPE_##DATATYPE); \
         \
@@ -564,5 +562,5 @@
         \
         errorFlag = false; \
-        out = psImageRoll(NULL,in,rows1/4,cols1/4); \
+        psImage *out = psImageRoll(NULL,in,rows1/4,cols1/4);	\
         for (psS32 row=0;row<rows1;row++) { \
             ps##DATATYPE *inRow = in->data.DATATYPE[(row+rows1/4)%rows1]; \
@@ -579,5 +577,5 @@
         psFree(in); \
         psFree(out); \
-        ok(!errorFlag, "psImageRoll() produced the correct data values");
+        ok(!errorFlag, "psImageRoll() produced the correct data values"); }
 
         testRollType(U8);
@@ -636,5 +634,4 @@
         system("mkdir temp");
         psS32 index = 0;
-        psBool fail = false;
         psF32 radianRot;
 
@@ -711,5 +708,4 @@
                 diag("verified psF32 image failed to be read (%d deg. rotation)", rot);
                 errorFlag = true;
-                fail = true;
             } else {
                 if(fTruth->numRows != fOut->numRows || fTruth->numCols != fOut->numCols) {
@@ -788,5 +784,4 @@
                      "(%d deg. rotation) BILINEAR",rot);
                 errorFlag = true;
-                fail = true;
             } else {
                 if (sBiTruth->numRows != sBiOut->numRows ||