Changeset 34470 for branches/czw_branch/20120906/psLib/src/imageops/psImageInterpolate.c

Timestamp:

Sep 25, 2012, 5:33:33 PM (14 years ago)

Author:

watersc1

Message:

Hardcoded version that gets the right solution. I wanted to save this before attempting to clean up the code.

File:

• branches/czw_branch/20120906/psLib/src/imageops/psImageInterpolate.c (modified) (1 diff)

branches/czw_branch/20120906/psLib/src/imageops/psImageInterpolate.c

@@ -947 +947 @@
   int yl,yh;
   const psImage *image = interp->image; // Image to interpolate
-  // const psImage *mask = interp->mask; // Mask to interpolate
-  const psImage *variance = interp->variance; // Variance to interpolate
 
   xl = floor(x);
   if (xl < 0) { xl = 0; }
   if (xl >= image->numCols) {xl = image->numCols - 1; }
+    //{ *imageValue = NAN; return PS_INTERPOLATE_STATUS_GOOD; }
   xh = xl + 1;
   if (xh >= image->numCols) {xh = image->numCols - 1; }
+    //{ *imageValue = NAN; return PS_INTERPOLATE_STATUS_GOOD; }
+    //
   yl = floor(y);
   if (yl < 0) { yl = 0; }
   if (yl >= image->numRows) {yl = image->numRows - 1; }
+    //{ *imageValue = NAN; return PS_INTERPOLATE_STATUS_GOOD; }
+  //
   yh = yl + 1;
   if (yh >= image->numRows) {yh = image->numRows - 1; }
-  if (varianceValue && variance) {
-    u1 = (xh - x) * variance->data.F32[yl][xl] + (x - xl) * variance->data.F32[yl][xh];
-    u2 = (xh - x) * variance->data.F32[yh][xl] + (x - xl) * variance->data.F32[yh][xh];
-
-    *varianceValue = (yh - y) * u1 + (y - yl) * u2;
-  }
-#if 0
-  if (maskValue && mask) {
-    u1 = (xh - x) * mask->data.F32[yl][xl] + (x - xl) * mask->data.F32[yl][xh];
-    u2 = (xh - x) * mask->data.F32[yh][xl] + (x - xl) * mask->data.F32[yh][xh];
-
-    maskValue = (yh - y) * u1 + (y - yl) * u2;
-  }
-#endif
+    //{ *imageValue = NAN; return PS_INTERPOLATE_STATUS_GOOD; }
+  //
   if (imageValue && image) {
     if (image->data.F32[yl][xl] == image->data.F32[yl][xh]) {