Changeset 11527

Timestamp:

Jan 31, 2007, 5:15:13 PM (19 years ago)

Author:

magnier

Message:

pedantic initialization of variables

Location:

trunk/psModules/src

Files:

• camera/pmFPARead.c (modified) (2 diffs)
• camera/pmFPA_JPEG.c (modified) (2 diffs)
• concepts/pmConceptsStandard.c (modified) (1 diff)
• objects/models/pmModel_GAUSS.c (modified) (1 diff)
• objects/models/pmModel_PGAUSS.c (modified) (1 diff)
• objects/models/pmModel_QGAUSS.c (modified) (1 diff)
• objects/pmSourcePhotometry.c (modified) (3 diffs)

trunk/psModules/src/camera/pmFPARead.c

@@ -183 +183 @@
     }
 
-    bool (*hduReadFunc)(pmHDU*, psFits*); // Function to use to read the HDU
-    psArray **imageArray;               // Array of images in the HDU
-    psElemType imageType;               // Expected type for image
+    bool (*hduReadFunc)(pmHDU*, psFits*) = NULL; // Function to use to read the HDU
+    psArray **imageArray = NULL; // Array of images in the HDU
+    psElemType imageType = PS_TYPE_F32; // Expected type for image
     switch (type) {
     case FPA_READ_TYPE_IMAGE:
@@ -245 +245 @@
         }
 
-        psImage **target;               // Place in readout to put carved image
+        psImage **target = NULL;               // Place in readout to put carved image
         switch (type) {
         case FPA_READ_TYPE_IMAGE:

trunk/psModules/src/camera/pmFPA_JPEG.c

@@ -5 +5 @@
  *  @author EAM, IfA
  *
- *  @version $Revision: 1.17 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-01-26 00:05:17 $
+ *  @version $Revision: 1.18 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-02-01 03:15:13 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -147 +147 @@
     }
 
-    float min, max;                 // Minimum and maximum for stretch
-    float mean, delta;
+    float min = 0;
+    float max = 0;                 // Minimum and maximum for stretch
+    float mean = 0;
+    float delta = 0;
 
     // measure the image statistics for scaling

trunk/psModules/src/concepts/pmConceptsStandard.c

@@ -422 +422 @@
     psStringSubstitute(&timesysName, "TIMESYS", "TIME");
     bool mdok = false;                  // Result of MD lookup
-    psTimeType timeSys;                 // The time system
+    psTimeType timeSys = PS_TIME_UTC; // The time system
     if (cell) {
         timeSys = psMetadataLookupS32(&mdok, cell->concepts, timesysName);

trunk/psModules/src/objects/models/pmModel_GAUSS.c

@@ -63 +63 @@
 bool PM_MODEL_LIMITS (psMinConstraintMode mode, int nParam, float *params, float *beta)
 {
-    float beta_lim, params_min, params_max;
-    float f1, f2, q1, q2;
+    float beta_lim = 0, params_min = 0, params_max = 0;
+    float f1 = 0, f2 = 0, q1 = 0, q2 = 0;
 
     // we need to calculate the limits for SXY specially

trunk/psModules/src/objects/models/pmModel_PGAUSS.c

@@ -65 +65 @@
 bool PM_MODEL_LIMITS (psMinConstraintMode mode, int nParam, float *params, float *beta)
 {
-    float beta_lim, params_min, params_max;
-    float f1, f2, q1, q2;
+    float beta_lim = 0, params_min = 0, params_max = 0;
+    float f1 = 0, f2 = 0, q1 = 0, q2 = 0;
 
     // we need to calculate the limits for SXY specially

trunk/psModules/src/objects/models/pmModel_QGAUSS.c

@@ -80 +80 @@
 bool PM_MODEL_LIMITS (psMinConstraintMode mode, int nParam, float *params, float *beta)
 {
-    float beta_lim, params_min, params_max;
-    float f1, f2, q1, q2;
+    float beta_lim = 0, params_min = 0, params_max = 0;
+    float f1 = 0, f2 = 0, q1 = 0, q2 = 0;
 
     // we need to calculate the limits for SXY specially

trunk/psModules/src/objects/pmSourcePhotometry.c

@@ -3 +3 @@
  *  @author EAM, IfA; GLG, MHPCC
  *
- *  @version $Revision: 1.20 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-11-20 05:23:23 $
+ *  @version $Revision: 1.21 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-02-01 03:15:13 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -478 +478 @@
                       const bool unweighted_sum) // should the cross product be weighted?
 {
-
-    int xi, yi;
-    double flux, wt, factor;
+    double flux = 0, wt = 0, factor = 0;
 
     const psImage *Pi = Mi->pixels;
@@ -488 +486 @@
     // note that this is addressing the same image pixels,
     // though only if both are source not model images
-    flux = 0;
-    for (yi = 0; yi < Pi->numRows; yi++) {
-        for (xi = 0; xi < Pi->numCols; xi++) {
+    for (int yi = 0; yi < Pi->numRows; yi++) {
+        for (int xi = 0; xi < Pi->numCols; xi++) {
             if (Ti->data.U8[yi][xi])
                 continue;