From 8ccf2f2dcaf4777cead4746c9d18680848a9e21a Mon Sep 17 00:00:00 2001
From: Oliver Duis <oduis@hotmail.com>
Date: Tue, 12 Apr 2011 23:18:23 +0200
Subject: [PATCH] Small image pipeline cleanups (cross checked by Emil, so no
 issue in list)

---
 rtengine/improccoordinator.cc |  6 ++++--
 rtengine/labimage.cc          | 13 -------------
 rtengine/labimage.h           |  1 -
 rtengine/simpleprocess.cc     |  5 +++--
 4 files changed, 7 insertions(+), 18 deletions(-)

diff --git a/rtengine/improccoordinator.cc b/rtengine/improccoordinator.cc
index 168c333ce..e2472c752 100644
--- a/rtengine/improccoordinator.cc
+++ b/rtengine/improccoordinator.cc
@@ -230,8 +230,10 @@ void ImProcCoordinator::updatePreviewImage (int todo, Crop* cropCall) {
             ipf.sharpening (nprevl, (float**)buffer);
             progress ("Pyramid equalizer...",100*readyphase/numofphases);
             ipf.dirpyrequalizer (nprevl);
-            progress ("Wavelet...",100*readyphase/numofphases);
-            ipf.waveletEqualizer (nprevl, true, true);
+
+            // Superset by pyreq
+            //progress ("Wavelet...",100*readyphase/numofphases);
+            //ipf.waveletEqualizer (nprevl, true, true);
         }
 		
 
diff --git a/rtengine/labimage.cc b/rtengine/labimage.cc
index e68e22587..dbdb96d34 100644
--- a/rtengine/labimage.cc
+++ b/rtengine/labimage.cc
@@ -20,19 +20,6 @@ LabImage::LabImage (int w, int h) : fromImage(false), W(w), H(h) {
         b[i] = index + i*W;
 }
 
-LabImage::LabImage (Image16* im) {
-
-    W = im->width;
-    H = im->height;
-	for (int i=0; i<H; i++) 
-		for (int j=0; j<W; j++) {
-			L[i][j] = im->r[i][j];
-			a[i][j] = im->g[i][j];
-			b[i][j] = im->b[i][j];
-		}
-    fromImage = true;
-}
-
 LabImage::~LabImage () {
 
     if (!fromImage) {
diff --git a/rtengine/labimage.h b/rtengine/labimage.h
index 0d2ce0b70..aee74ce46 100644
--- a/rtengine/labimage.h
+++ b/rtengine/labimage.h
@@ -34,7 +34,6 @@ class LabImage {
         float** b;
 
      LabImage (int w, int h);
-     LabImage (Image16* im);
     ~LabImage ();
 };
 }
diff --git a/rtengine/simpleprocess.cc b/rtengine/simpleprocess.cc
index b6e3df7e3..dff6fafda 100644
--- a/rtengine/simpleprocess.cc
+++ b/rtengine/simpleprocess.cc
@@ -168,7 +168,7 @@ IImage16* processImage (ProcessingJob* pjob, int& errorCode, ProgressListener* p
     hist16.clear();
     for (int i=0; i<fh; i++)
         for (int j=0; j<fw; j++)
-            hist16[CLIP((int)(2*(labView->L[i][j])))]++;
+            hist16[CLIP((int)((labView->L[i][j])))]++;
 
     // luminance processing
 	CurveFactory::complexLCurve (params.labCurve.brightness, params.labCurve.contrast, params.labCurve.lcurve, hist16, curve, dummy, 1);
@@ -180,12 +180,13 @@ IImage16* processImage (ProcessingJob* pjob, int& errorCode, ProgressListener* p
   	ipf.impulsedenoise (labView);
 	ipf.defringe (labView);
 	//ipf.lumadenoise (labView, buffer);
+ 	ipf.dirpyrdenoise (labView);
     ipf.sharpening (labView, (float**)buffer);
 
     // color processing
     /*ipf.colorCurve (labView, labView);
     ipf.colordenoise (labView, buffer);*/
-	ipf.dirpyrdenoise (labView);
+
 
     // wavelet equalizer
     //ipf.waveletEqualizer (labView, true, true);