Changeset 31879

Timestamp:

Jul 14, 2011, 10:41:53 AM (15 years ago)

Author:

eugene

Message:

merge changes from trunk to fix pswarp superpixel endpost error

Location:

tags/ipp-20110622/pswarp

Files:

• . (modified) (1 prop)
• src/pswarpMapGrid.c (modified) (1 diff)
• src/pswarpTransformReadout.c (modified) (1 diff)

tags/ipp-20110622/pswarp/src/pswarpMapGrid.c

@@ -32 +32 @@
     int Ny = src->image->numRows + src->image->row0;
 
-    // allocate an extra superpixel to carry the remainder
-    int nXpts = Nx / nXpix;
-    int nYpts = Ny / nYpix;
-    if (Nx % nXpix) nXpts ++;
-    if (Ny % nYpix) nYpts ++;
+    // always allocate an extra superpixel to handle spillover
+    int nXpts = (int)(Nx / nXpix) + 1;
+    int nYpts = (int)(Ny / nYpix) + 1;
 
     // create the grid of maps

tags/ipp-20110622/pswarp/src/pswarpTransformReadout.c

@@ -110 +110 @@
     // Ensure threading is off for the covariance calculation, since we are threading on a different level.
     psImageCovarianceSetThreads(false);
+
+    psAssert (xGridMin >= 0, "xGridMin too small\n");
+    psAssert (yGridMin >= 0, "yGridMin too small\n");
+    psAssert (xGridMax < grid->nXpts, "xGridMax too big\n");
+    psAssert (yGridMax < grid->nYpts, "yGridMax too big\n");
 
     // create jobs and supply them to the threads