Changeset 35819

Timestamp:

Jul 12, 2013, 4:37:40 PM (13 years ago)

Author:

watersc1

Message:

backports from trunk to allow compilation with -optimize

Location:

tags/ipp-20130712

Files:

• Ohana/src/dvomerge/src/dvomerge_client.c (modified) (1 diff, 1 prop)
• psModules/src/imcombine/pmSubtractionSimple.c (modified) (1 diff)

tags/ipp-20130712/Ohana/src/dvomerge/src/dvomerge_client.c

@@ -10 +10 @@
   SkyList *inlist;
   char filename[256], *input, *output;
-  IDmapType *IDmap;
+  IDmapType *IDmap = NULL;
   PhotCodeData *inputPhotcodes;
   PhotCodeData *outputPhotcodes;

tags/ipp-20130712/psModules/src/imcombine/pmSubtractionSimple.c

@@ -76 +76 @@
   // We've already validated the input values at this level
   float sig2fwhm = 2.0 * sqrt(2.0 * log(2.0));
-  float fwhm1,fwhm2;
-  float sigma1,sigma2,sigmaKern;
+  float fwhm1 = 0,fwhm2 = 0;
+  float sigma1 = 0,sigma2 = 0,sigmaKern = 0;
   float chisq = 1.0;
   int convolution_direction = 0;