Changeset 8669 for trunk/psModules/src/imcombine

Timestamp:

Aug 29, 2006, 11:39:44 AM (20 years ago)

Author:

jhoblitt

Message:

fix a wide range of format string errors

Location:

trunk/psModules/src/imcombine

Files:

• pmImageCombine.c (modified) (4 diffs)
• pmImageSubtract.c (modified) (9 diffs)
• pmReadoutCombine.c (modified) (5 diffs)

trunk/psModules/src/imcombine/pmImageCombine.c

@@ -8 +8 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-08-09 02:37:07 $
+ *  @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-08-29 21:39:44 $
  *
  *  XXX: pmRejectPixels() has a known bug with the pmImageTransform() call.
@@ -50 +50 @@
     PS_ASSERT_PTR_NON_NULL(images, combine);
     psU32 numImages = images->n;
-    psTrace("psModules.imcombine", 3, "Calling pmCombineImages(%d)\n", images->n);
+    psTrace("psModules.imcombine", 3, "Calling pmCombineImages(%ld)\n", images->n);
 
     if (errors != NULL) {
         if (images->n != errors->n) {
-            psError(PS_ERR_UNKNOWN, true, "images and errors args must have same length (%d != %d)\n",
+            psError(PS_ERR_UNKNOWN, true, "images and errors args must have same length (%ld != %ld)\n",
                     images->n, errors->n);
             return(combine);
@@ -61 +61 @@
     if (masks != NULL) {
         if (images->n != masks->n) {
-            psError(PS_ERR_UNKNOWN, true, "images and masks args must have same length (%d != %d)\n",
+            psError(PS_ERR_UNKNOWN, true, "images and masks args must have same length (%ld != %ld)\n",
                     images->n, masks->n);
             return(combine);
@@ -297 +297 @@
     psFree(qpPtr);
 
-    psTrace("psModules.imcombine", 3, "Exiting pmCombineImages(%d)\n", images->n);
+    psTrace("psModules.imcombine", 3, "Exiting pmCombineImages(%ld)\n", images->n);
     return(combine);
 }

trunk/psModules/src/imcombine/pmImageSubtract.c

@@ -7 +7 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-08-09 02:37:07 $
+ *  @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-08-29 21:39:44 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -191 +191 @@
     PS_ASSERT_VECTOR_NON_NULL(orders, NULL);
     psTrace("psModules.imcombine", 3,
-            "Calling pmSubtractionKernelsAllocISIS(%d, %d, %d, %d)\n",
+            "Calling pmSubtractionKernelsAllocISIS(%ld, %ld, %d, %d)\n",
             sigmas->n, orders->n, size, spatialOrder);
     PS_ASSERT_INT_POSITIVE(size, NULL);
@@ -307 +307 @@
 
     psTrace("psModules.imcombine", 3,
-            "Exiting pmSubtractionKernelsAllocISIS(%d, %d, %d, %d)\n",
+            "Exiting pmSubtractionKernelsAllocISIS(%ld, %ld, %d, %d)\n",
             sigmas->n, orders->n, size, spatialOrder);
     return(tmp);
@@ -679 +679 @@
     }
     psS32 nBF = kernels->u->n;
-    PS_ASSERT_VECTOR_SIZE(solution, nBF+1, NULL);
+    PS_ASSERT_VECTOR_SIZE(solution, (long)nBF+1, NULL);
 
     psS32 numCols = input->numCols;
@@ -826 +826 @@
             } else {
                 PS_ASSERT_VECTOR_TYPE(stampVector, PS_TYPE_F64, false);
-                PS_ASSERT_VECTOR_SIZE(stampVector, numSolveParams, false);
+                PS_ASSERT_VECTOR_SIZE(stampVector, (long)numSolveParams, false);
             }
             psVectorInit(stampVector, 0.0);
@@ -1038 +1038 @@
     if (solution != NULL) {
         PS_ASSERT_VECTOR_TYPE(solution, PS_TYPE_F64, NULL);
-        PS_ASSERT_VECTOR_SIZE(solution, size, NULL);
+        PS_ASSERT_VECTOR_SIZE(solution, (long)size, NULL);
     } else {
         solution = psVectorAlloc(size, PS_TYPE_F64);
@@ -1070 +1070 @@
             psVector *stampVector = stamp->vector;
             PS_ASSERT_VECTOR_TYPE(stampVector, PS_TYPE_F64, NULL);
-            PS_ASSERT_VECTOR_SIZE(stampVector, size, NULL);
+            PS_ASSERT_VECTOR_SIZE(stampVector, (long)size, NULL);
             PS_ASSERT_IMAGE_TYPE(stampMatrix, PS_TYPE_F64, NULL);
             PS_ASSERT_IMAGE_SIZE(stampMatrix, size, size, NULL);
@@ -1177 +1177 @@
     }
     psS32 nBF = kernels->u->n;
-    PS_ASSERT_VECTOR_SIZE(solution, nBF+1, NULL);
+    PS_ASSERT_VECTOR_SIZE(solution, (long)nBF+1, NULL);
 
     psS32 kernelSize = kernels->size;
@@ -1269 +1269 @@
 
     psS32 nBF = kernels->u->n;
-    PS_ASSERT_VECTOR_SIZE(solution, nBF+1, false);
+    PS_ASSERT_VECTOR_SIZE(solution, (long)nBF+1, false);
 
     psVector *deviations = CalculateDeviations(NULL,

trunk/psModules/src/imcombine/pmReadoutCombine.c

@@ -5 +5 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.23 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-08-09 02:37:07 $
+ *  @version $Revision: 1.24 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-08-29 21:39:44 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -136 +136 @@
 
         if (!readout || !readout->image) {
-            psError(PS_ERR_UNEXPECTED_NULL, true, "Input readout %d is NULL or has NULL image.\n", i);
+            psError(PS_ERR_UNEXPECTED_NULL, true, "Input readout %ld is NULL or has NULL image.\n", i);
             return false;
         }
@@ -151 +151 @@
         if (readout->weight) {
             if (valid && !haveWeights) {
-                psLogMsg(__func__, PS_LOG_WARN, "Readout %d has a weight map, but others don't --- "
+                psLogMsg(__func__, PS_LOG_WARN, "Readout %ld has a weight map, but others don't --- "
                          "weights ignored.\n", i);
             } else {
@@ -157 +157 @@
             }
         } else if (haveWeights) {
-            psLogMsg(__func__, PS_LOG_WARN, "Readout %d doesn't have a weight map, but others do --- "
+            psLogMsg(__func__, PS_LOG_WARN, "Readout %ld doesn't have a weight map, but others do --- "
                      "weights ignored.\n", i);
             haveWeights = false;
@@ -168 +168 @@
         minInputCols = PS_MIN(minInputCols, readout->col0);
         maxInputCols = PS_MAX(maxInputCols, readout->col0 + readout->image->numCols);
-        psTrace("psModules.imcombine", 7, "Readout %d: offset %d,%d; size %dx%d\n", i,
+        psTrace("psModules.imcombine", 7, "Readout %ld: offset %d,%d; size %dx%d\n", i,
                 readout->col0, readout->row0, readout->image->numCols, readout->image->numRows);
     }