Changeset 2841

Timestamp:

Dec 28, 2004, 4:52:28 PM (22 years ago)

Author:

gusciora

Message:

...

File:

• trunk/psModules/src/pmSubtractBias.c (modified) (6 diffs)

trunk/psModules/src/pmSubtractBias.c

@@ -6 +6 @@
  *  @author George Gusciora, MHPCC
  *
- *  @version $Revision: 1.20 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-12-28 19:04:29 $
+ *  @version $Revision: 1.21 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-12-29 02:52:28 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -38 +38 @@
     }
 
+    // XXX: What should be returned here?
     if (((in->image)->numRows + in->row0 - bias->row0) > (bias->image)->numRows) {
         psError(PS_ERR_UNKNOWN,true, "bias image does not have enough rows\n");
+        return(in);
     }
     if (((in->image)->numCols + in->row0 - bias->row0) > (bias->image)->numCols) {
         psError(PS_ERR_UNKNOWN,true, "bias image does not have enough columns\n");
+        return(in);
     }
 
@@ -291 +294 @@
         if ((overScanAxis == PM_OVERSCAN_ROWS) || (overScanAxis == PM_OVERSCAN_COLUMNS)) {
             if (overScanAxis == PM_OVERSCAN_ROWS) {
+                if (myOverscanImage->numCols != (in->image)->numCols) {
+                    psLogMsg(__func__, PS_LOG_WARN,
+                             "WARNING: pmSubtractBias.(): overscan image has %d columns, input image has %d columns\n",
+                             myOverscanImage->numCols, in->image->numCols);
+                }
                 // We create a row vector and subtract this vector from image.
                 overscanVector = psVectorAlloc(myOverscanImage->numCols, PS_TYPE_F32);
@@ -309 +317 @@
                 if ((fit == PM_FIT_POLYNOMIAL) || (fit == PM_FIT_SPLINE)) {
                     psVector *newVec = ScaleOverscanVector(overscanVector,
-                                                           (in->image)->numCols, fitSpec, fit);
+                                                           (in->image)->numCols,
+                                                           fitSpec, fit);
                     psFree(overscanVector);
                     overscanVector = newVec;
@@ -317 +326 @@
             if (overScanAxis == PM_OVERSCAN_COLUMNS) {
                 // We create a column vector and subtract this vector from image.
+                if (myOverscanImage->numRows != (in->image)->numRows) {
+                    psLogMsg(__func__, PS_LOG_WARN,
+                             "WARNING: pmSubtractBias.(): overscan image has %d rows, input image has %d rows\n",
+                             myOverscanImage->numRows, in->image->numRows);
+                }
                 overscanVector = psVectorAlloc(myOverscanImage->numRows, PS_TYPE_F32);
                 for (i=0;i<overscanVector->n;i++) {
@@ -335 +349 @@
                 if ((fit == PM_FIT_POLYNOMIAL) || (fit == PM_FIT_SPLINE)) {
                     psVector *newVec = ScaleOverscanVector(overscanVector,
-                                                           (in->image)->numRows, fitSpec, fit);
+                                                           (in->image)->numRows,
+                                                           fitSpec, fit);
                     psFree(overscanVector);
                     overscanVector = newVec;