Changeset 8669 for trunk/psModules/src/detrend

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/detrend

Files:

• pmFlatNormalize.c (modified) (2 diffs)
• pmFringeStats.c (modified) (4 diffs)
• pmNonLinear.c (modified) (2 diffs)
• pmSubtractBias.c (modified) (2 diffs)

trunk/psModules/src/detrend/pmFlatNormalize.c

@@ -28 +28 @@
         if (*expFluxesPtr) {
             PS_ASSERT_VECTOR_TYPE(*expFluxesPtr, PS_TYPE_F32, false);
-            PS_ASSERT_VECTOR_SIZE(*expFluxesPtr, numExps, false);
+            PS_ASSERT_VECTOR_SIZE(*expFluxesPtr, (long)numExps, false);
         } else {
             *expFluxesPtr = psVectorAlloc(numExps, PS_TYPE_F32);
@@ -43 +43 @@
         if (*chipGainsPtr) {
             PS_ASSERT_VECTOR_TYPE(*chipGainsPtr, PS_TYPE_F32, false);
-            PS_ASSERT_VECTOR_SIZE(*chipGainsPtr, numChips, false);
+            PS_ASSERT_VECTOR_SIZE(*chipGainsPtr, (long)numChips, false);
         } else {
             *chipGainsPtr = psVectorAlloc(numChips, PS_TYPE_F32);

trunk/psModules/src/detrend/pmFringeStats.c

@@ -3 +3 @@
  *  @author Eugene Magnier, IfA
  *
- *  @version $Revision: 1.16 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-08-09 02:37:07 $
+ *  @version $Revision: 1.17 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-08-29 21:39:44 $
  *
  *  Copyright 2004 IfA
@@ -115 +115 @@
     PS_ASSERT_VECTOR_TYPE(x, PS_TYPE_F32, false);
     PS_ASSERT_VECTOR_TYPE(y, PS_TYPE_F32, false);
-    PS_ASSERT_VECTOR_SIZE(x, numRows, false);
-    PS_ASSERT_VECTOR_SIZE(y, numRows, false);
+    PS_ASSERT_VECTOR_SIZE(x, (long)numRows, false);
+    PS_ASSERT_VECTOR_SIZE(y, (long)numRows, false);
     if (mask) {
         PS_ASSERT_VECTOR_NON_NULL(mask, false);
         PS_ASSERT_VECTOR_TYPE(mask, PS_TYPE_U8, false);
-        PS_ASSERT_VECTOR_SIZE(mask, numRows, false);
+        PS_ASSERT_VECTOR_SIZE(mask, (long)numRows, false);
     }
 
@@ -356 +356 @@
     PS_ASSERT_VECTOR_TYPE(f, PS_TYPE_F32, false);
     PS_ASSERT_VECTOR_TYPE(df, PS_TYPE_F32, false);
-    PS_ASSERT_VECTOR_SIZE(f, numRows, false);
-    PS_ASSERT_VECTOR_SIZE(df, numRows, false);
+    PS_ASSERT_VECTOR_SIZE(f, (long)numRows, false);
+    PS_ASSERT_VECTOR_SIZE(df, (long)numRows, false);
 
     // We need to write:
@@ -388 +388 @@
     PS_ASSERT_INT_POSITIVE(regions->nRequested, NULL);
     PS_ASSERT_VECTORS_SIZE_EQUAL(regions->x, regions->y, NULL);
-    PS_ASSERT_VECTOR_SIZE(regions->x, regions->nRequested, NULL);
+    PS_ASSERT_VECTOR_SIZE(regions->x, (long)regions->nRequested, NULL);
 
     if (extname && strlen(extname) > 0) {

trunk/psModules/src/detrend/pmNonLinear.c

@@ -10 +10 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.8 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-06-21 03:21:16 $
+ *  @version $Revision: 1.9 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-08-29 21:39:44 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -80 +80 @@
         tableSize = PS_MIN(inFlux->n, outFlux->n);
         psLogMsg(__func__, PS_LOG_WARN,
-                 "WARNING: pmNonLinear.c: pmNonLinearityLookup(): input vectors have different sizes (%d, %d)\n", inFlux->n, outFlux->n);
+                 "WARNING: pmNonLinear.c: pmNonLinearityLookup(): input vectors have different sizes (%ld, %ld)\n", inFlux->n, outFlux->n);
     }
     PS_ASSERT_VECTOR_TYPE(inFlux, PS_TYPE_F32, NULL);

trunk/psModules/src/detrend/pmSubtractBias.c

@@ -11 +11 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.8 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-08-09 02:37:07 $
+ *  @version $Revision: 1.9 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-08-29 21:39:44 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -288 +288 @@
         psStatsOptions statistic = psStatsSingleOption(overscanOpts->stat->options); // Statistic to use
         if (statistic == 0) {
-            psError(PS_ERR_BAD_PARAMETER_VALUE, false, "Multiple or no statistics options set: %x\n",
+            psError(PS_ERR_BAD_PARAMETER_VALUE, false, "Multiple or no statistics options set: %p\n",
                     overscanOpts->stat);
             return false;