[Rawstudio-commit] rawspeed r260 - RawSpeed

[Klaus Post]

Author: post
Date: 2010-07-15 16:25:30 +0200 (Thu, 15 Jul 2010)
New Revision: 260

Modified:
   RawSpeed/RawImage.cpp
Log:
Don't scale values that are already to scale, and fix estimation issue for 
unknown cameras.

Modified: RawSpeed/RawImage.cpp
===================================================================
--- RawSpeed/RawImage.cpp       2010-07-15 14:23:13 UTC (rev 259)
+++ RawSpeed/RawImage.cpp       2010-07-15 14:25:30 UTC (rev 260)
@@ -117,12 +117,12 @@
 }
 
 void RawImageData::scaleBlackWhite() {
-  const int skipBorder = 100;
-  int gw = (dim.x - skipBorder*2) * cpp;
+  const int skipBorder = 150;
+  int gw = (dim.x - skipBorder) * cpp;
   if (blackLevel < 0 || whitePoint == 65536) {  // Estimate
     int b = 65536;
     int m = 0;
-    for (int row = skipBorder;row < (dim.y - skipBorder);row++) {
+    for (int row = skipBorder*cpp;row < (dim.y - skipBorder);row++) {
       ushort16 *pixel = (ushort16*)getData(skipBorder, row);
       for (int col = skipBorder ; col < gw ; col++) {
         b = MIN(*pixel, b);
@@ -143,6 +143,8 @@
   }
 
   float f = 65535.0f / (float)(whitePoint - blackLevel);
+  if (whitePoint == 65535 && blackLevel == 0)
+    return;
   scaleValues(f);
 }
 


_______________________________________________
Rawstudio-commit mailing list
Rawstudio-commit@rawstudio.org
http://rawstudio.org/cgi-bin/mailman/listinfo/rawstudio-commit