Changeset 8669 for trunk/psModules/src/imcombine/pmImageSubtract.c

Timestamp:

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

Author:

jhoblitt

Message:

fix a wide range of format string errors

File:

• trunk/psModules/src/imcombine/pmImageSubtract.c (modified) (9 diffs)

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,