Changeset 14797

Timestamp:

Sep 10, 2007, 9:08:57 AM (19 years ago)

Author:

Paul Price

Message:

Fixing uninitialised variable warning.

Location:

trunk

Files:

• ppMerge/src/ppMergeCombine.c (modified) (1 diff)
• ppSim/src/ppSim.h (modified) (5 diffs)
• ppSim/src/ppSimArguments.c (modified) (5 diffs)

trunk/ppMerge/src/ppMergeCombine.c

@@ -154 +154 @@
             }
 
-            float shutterRef;           // Reference shutter correction
+            float shutterRef = NAN;     // Reference shutter correction
             if (options->shutter) {
                 shutterRef = pmShutterCorrectionReference(shutters->data[cellNum]);

trunk/ppSim/src/ppSim.h

@@ -32 +32 @@
 // Type of image to simulate
 typedef enum {
+    PPSIM_TYPE_NONE,                    // No type set
     PPSIM_TYPE_BIAS,                    // Bias image
     PPSIM_TYPE_DARK,                    // Dark image
@@ -68 +69 @@
 /// Parse command-line arguments
 void ppSimArguments(int argc, char *argv[], ///< Command-line arguments
-                    pmConfig *config ///< Configuration
-                    );
+                    pmConfig *config ///< Configuration
+                    );
 
 /// Create output file
@@ -75 +76 @@
 /// Returns a borrowed pointer to the FPA file.
 pmFPAfile *ppSimCreate(pmConfig *config ///< Configuration
-                       );
+                       );
 
 // Return bounds of a chip, based on the concepts
 psRegion *ppSimChipBounds(const pmChip *chip, // Chip for which to determine size
-                          pmFPAview *view // View for chip
-                          );
+                          pmFPAview *view // View for chip
+                          );
 
 // Return bounds of an FPA, based on the concepts
 psRegion *ppSimFPABounds(const pmFPA *fpa       // FPA for which to determine size
-                         );
+                         );
 
 /// Loop over the output file, generating simulated data
 bool ppSimLoop(pmConfig *config ///< Configuration
-                 );
+                 );
 
 psVector *ppSimMakeBiassec (pmCell *cell, pmConfig *config);
@@ -100 +101 @@
 
 bool ppSimInitHeader(pmConfig *config,
-                     pmFPA *fpa,
-                     pmChip *chip,
-                     pmCell *cell);
+                     pmFPA *fpa,
+                     pmChip *chip,
+                     pmCell *cell);
 
-bool ppSimSaturate(pmReadout *readout,  // Image to apply saturation
-                   const pmConfig *config); // Saturation level
+bool ppSimSaturate(pmReadout *readout,  // Image to apply saturation
+                   const pmConfig *config); // Saturation level
 
 bool ppSimUpdateConceptsFPA (pmFPA *fpa, pmConfig *config);
@@ -113 +114 @@
 
 bool ppSimAddNoise(psImage *signal,
-                   psImage *variance,
-                   const pmCell *cell,                 
-                   const pmConfig *config,                     
-                   const psRandom *rng // Random number generator
+                   psImage *variance,
+                   const pmCell *cell,
+                   const pmConfig *config,
+                   const psRandom *rng // Random number generator
     );
 

trunk/ppSim/src/ppSimArguments.c

@@ -77 +77 @@
         usage(argv[0], arguments, config);
     }
- 
+
     if (!psArgumentParse(arguments, &argc, argv)) { usage (argv[0], arguments, config); }
 
@@ -84 +84 @@
     psString formatName = psMetadataLookupStr(NULL, arguments, "-format"); // Name of format
     if (formatName) {
-        // XXX delay the config below until ppSimCreate?
+        // XXX delay the config below until ppSimCreate?
         config->formatName = psMemIncrRefCounter(formatName);
 
@@ -109 +109 @@
         usage(argv[0], arguments, config);
     }
-    ppSimType type;                     // Type to simulate
+    ppSimType type = PPSIM_TYPE_NONE;   // Type to simulate
     if (strcasecmp(typeStr, "BIAS") == 0) {
         type = PPSIM_TYPE_BIAS;
@@ -122 +122 @@
         usage(argv[0], arguments, config);
     }
+    assert(type != PPSIM_TYPE_NONE);
     psMetadataAddS32(config->arguments, PS_LIST_TAIL, "TYPE", 0, "Exposure type", type);
 
@@ -200 +201 @@
 
 
-        const char *psfClass = psMetadataLookupStr(NULL, arguments, "-psfclass"); // Filter name
-        psMetadataAddStr(config->arguments, PS_LIST_TAIL, "PSF.MODEL", 0, "PSF model class", psfClass);
+        const char *psfClass = psMetadataLookupStr(NULL, arguments, "-psfclass"); // Filter name
+        psMetadataAddStr(config->arguments, PS_LIST_TAIL, "PSF.MODEL", 0, "PSF model class", psfClass);
     }