Changeset 7311 for trunk/psModules/src/pslib/psImageUnbin.c

Timestamp:

Jun 2, 2006, 3:02:08 PM (20 years ago)

Author:

Paul Price

Message:

Applying RHL patch. Generally improves the error handling and traceback. pmConcepts.c and pmConceptsRead.c done by PAP (RHL did this also, but I had already done them). Resolved conflicts, except for pmFPAfile.c, which uses psAbort in some instances where RHL's patch had psError; leave this for Gene to decide.

File:

• trunk/psModules/src/pslib/psImageUnbin.c (modified) (2 diffs)

trunk/psModules/src/pslib/psImageUnbin.c

@@ -143 +143 @@
         }
         // Nx,Ny
-        V = vIn[nx-1][ny-1];
+        V = vIn[ny-1][nx-1];
         for (int iy = ny*DY - dy; iy < Ny; iy++)
         {
@@ -161 +161 @@
 static int MAX_SAMPLE_PIXELS;
 
-void psImageClippedStatsInit (int nMax)
+void psImageClippedStatsInit (int nMax, unsigned long seed)
 {
 
     MAX_SAMPLE_PIXELS = nMax;
 
+    if (rnd && seed) {
+        psFree(rnd);
+        rnd = NULL;
+    }
     if (!rnd) {
-        rnd = psRandomAlloc (PS_RANDOM_TAUS, 0);
+        rnd = psRandomAlloc (PS_RANDOM_TAUS, seed);
     }
     return;