Update of /cvsroot/wavelet/Wavelet
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv22869
Modified Files:
ImageResizer.cc
Log Message:
Minor fix for the calculation of image stats if image optimization
is turned off.
Index: ImageResizer.cc
===================================================================
RCS file: /cvsroot/wavelet/Wavelet/ImageResizer.cc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ImageResizer.cc 10 Aug 2007 17:55:45 -0000 1.2
--- ImageResizer.cc 10 Aug 2007 18:38:14 -0000 1.3
***************
*** 226,236 ****
outerSDev = sqrt (outerVariance);
-
- /* we calculate this at the end of the image optimization if this is set */
- if (!m_optimizeImage)
- {
- m_innerSDeviation = innerSDev;
- m_innerAvgPerSize = innerAvg / m_innerRegionSize;
- }
}
--- 226,229 ----
***************
*** 387,390 ****
--- 380,394 ----
int nDiscardCols = (int)(m_cropMaxCols * m_colsMapping + 0.5);
+ if (!m_optimizationCalculated)
+ {
+ coeff innerAvg, innerSDev;
+ calcInnerStats (innerAvg, innerSDev,
+ nDiscardRows, nDiscardCols,
+ m_maxDetail->rows () - nDiscardRows,
+ m_maxDetail->cols () - nDiscardCols);
+ m_innerSDeviation = innerSDev;
+ m_innerAvgPerSize = innerAvg / m_innerRegionSize;
+ }
+
if (m_cropWhat != CROP_AUTOMATICALLY)
{
|
