Context Navigation

pmSubtractionMask.c

Timestamp:

Jun 25, 2009, 2:00:56 PM (17 years ago)

Author:

eugene

Message:

merging changes from head

Location:

branches/eam_branches/20090522

Files:

Property svn:mergeinfo changed

/branches/pap_mops (added)	merged: 24221,24373,24375-24377,24392,24413,24416,24427-24430,24435-24439,24442-24452,24456-24457,24499,24501,24503-24505,24507,24509
/trunk (added)	merged: 24239-24242,24245-24308,24311-24372,24374,24378-24391,24393-24412,24414-24415,24417-24426,24431-24434,24440-24441,24453-24455,24458-24498,24500,24502,24506,24508,24510-24513,24515-24528,24530-24556

branches/eam_branches/20090522/psModules
- Property svn:mergeinfo changed (with no actual effect on merging)

-              r23851
+              r24557
 #include <pslib.h>
+#include "pmErrorCodes.h"
 #include "pmSubtraction.h"
 #include "pmSubtractionKernels.h"
 …
+        }
         if (numBad > badFrac * numCols * numRows) {
             psError(PS_ERR_BAD_PARAMETER_VALUE, true,
+            psError(PM_ERR_SMALL_AREA, true,
                     "Fraction of bad pixels (%d/%d=%f) exceeds limit (%f)\n",
                     numBad, numCols * numRows, (float)numBad/(float)(numCols * numRows), badFrac);

Note: See TracChangeset for help on using the changeset viewer.