- Timestamp:
- Jul 17, 2014, 12:36:19 PM (12 years ago)
- Location:
- branches/eam_branches/ipp-ops-20130712
- Files:
-
- 2 edited
-
. (modified) (1 prop)
-
psLib/src/imageops/psImageBinning.c (modified) (4 diffs)
Legend:
- Unmodified
- Added
- Removed
-
branches/eam_branches/ipp-ops-20130712
- Property svn:mergeinfo changed
-
branches/eam_branches/ipp-ops-20130712/psLib/src/imageops/psImageBinning.c
r23486 r37068 177 177 PS_ASSERT_INT_POSITIVE(binning->nXbin, NAN); 178 178 PS_ASSERT_INT_POSITIVE(binning->nYbin, NAN); 179 PS_ASSERT_INT_LESS_THAN_OR_EQUAL(binning->nXskip, binning->nXbin, NAN);180 PS_ASSERT_INT_LESS_THAN_OR_EQUAL(binning->nYskip, binning->nYbin, NAN);179 // PS_ASSERT_INT_LESS_THAN_OR_EQUAL(binning->nXskip, binning->nXbin, NAN); 180 // PS_ASSERT_INT_LESS_THAN_OR_EQUAL(binning->nYskip, binning->nYbin, NAN); 181 181 182 182 double xRuff = (xFine - binning->nXskip)/binning->nXbin; … … 187 187 PS_ASSERT_INT_POSITIVE(binning->nXbin, NAN); 188 188 PS_ASSERT_INT_POSITIVE(binning->nYbin, NAN); 189 PS_ASSERT_INT_LESS_THAN_OR_EQUAL(binning->nXskip, binning->nXbin, NAN);190 PS_ASSERT_INT_LESS_THAN_OR_EQUAL(binning->nYskip, binning->nYbin, NAN);189 // PS_ASSERT_INT_LESS_THAN_OR_EQUAL(binning->nXskip, binning->nXbin, NAN); 190 // PS_ASSERT_INT_LESS_THAN_OR_EQUAL(binning->nYskip, binning->nYbin, NAN); 191 191 192 192 double yRuff = (yFine - binning->nYskip)/binning->nYbin; … … 199 199 PS_ASSERT_INT_POSITIVE(binning->nXbin, NAN); 200 200 PS_ASSERT_INT_POSITIVE(binning->nYbin, NAN); 201 PS_ASSERT_INT_LESS_THAN_OR_EQUAL(binning->nXskip, binning->nXbin, NAN);202 PS_ASSERT_INT_LESS_THAN_OR_EQUAL(binning->nYskip, binning->nYbin, NAN);201 // PS_ASSERT_INT_LESS_THAN_OR_EQUAL(binning->nXskip, binning->nXbin, NAN); 202 // PS_ASSERT_INT_LESS_THAN_OR_EQUAL(binning->nYskip, binning->nYbin, NAN); 203 203 204 204 double xFine = xRuff * binning->nXbin + binning->nXskip; … … 209 209 PS_ASSERT_INT_POSITIVE(binning->nXbin, NAN); 210 210 PS_ASSERT_INT_POSITIVE(binning->nYbin, NAN); 211 PS_ASSERT_INT_LESS_THAN_OR_EQUAL(binning->nXskip, binning->nXbin, NAN);212 PS_ASSERT_INT_LESS_THAN_OR_EQUAL(binning->nYskip, binning->nYbin, NAN);211 // PS_ASSERT_INT_LESS_THAN_OR_EQUAL(binning->nXskip, binning->nXbin, NAN); 212 // PS_ASSERT_INT_LESS_THAN_OR_EQUAL(binning->nYskip, binning->nYbin, NAN); 213 213 214 214 double yFine = yRuff * binning->nYbin + binning->nYskip;
Note:
See TracChangeset
for help on using the changeset viewer.
