liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Small image pipeline cleanups (cross checked by Emil, so no issue in list)

Browse Source
This commit is contained in:
Oliver Duis
2011-04-12 23:18:23 +02:00
parent b800afff00
commit 8ccf2f2dca
4 changed files with 7 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
rtengine/improccoordinator.cc
View File

@@ -230,8 +230,10 @@ void ImProcCoordinator::updatePreviewImage (int todo, Crop* cropCall) {
ipf.sharpening (nprevl, (float**)buffer); ipf.sharpening (nprevl, (float**)buffer);
progress ("Pyramid equalizer...",100*readyphase/numofphases); progress ("Pyramid equalizer...",100*readyphase/numofphases);
ipf.dirpyrequalizer (nprevl); 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);
} }

13
rtengine/labimage.cc
View File

@@ -20,19 +20,6 @@ LabImage::LabImage (int w, int h) : fromImage(false), W(w), H(h) {
b[i] = index + i*W; 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 () { LabImage::~LabImage () {
if (!fromImage) { if (!fromImage) {

1
rtengine/labimage.h
View File

@@ -34,7 +34,6 @@ class LabImage {
float** b; float** b;
LabImage (int w, int h); LabImage (int w, int h);
LabImage (Image16* im);
~LabImage (); ~LabImage ();
}; };
} }

5
rtengine/simpleprocess.cc
View File

@@ -168,7 +168,7 @@ IImage16* processImage (ProcessingJob* pjob, int& errorCode, ProgressListener* p
hist16.clear(); hist16.clear();
for (int i=0; i<fh; i++) for (int i=0; i<fh; i++)
for (int j=0; j<fw; j++) for (int j=0; j<fw; j++)
hist16[CLIP((int)(2*(labView->L[i][j])))]++; hist16[CLIP((int)((labView->L[i][j])))]++;
// luminance processing // luminance processing
CurveFactory::complexLCurve (params.labCurve.brightness, params.labCurve.contrast, params.labCurve.lcurve, hist16, curve, dummy, 1); 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.impulsedenoise (labView);
ipf.defringe (labView); ipf.defringe (labView);
//ipf.lumadenoise (labView, buffer); //ipf.lumadenoise (labView, buffer);
ipf.dirpyrdenoise (labView);
ipf.sharpening (labView, (float**)buffer); ipf.sharpening (labView, (float**)buffer);
// color processing // color processing
/*ipf.colorCurve (labView, labView); /*ipf.colorCurve (labView, labView);
ipf.colordenoise (labView, buffer);*/ ipf.colordenoise (labView, buffer);*/
ipf.dirpyrdenoise (labView);
// wavelet equalizer // wavelet equalizer
//ipf.waveletEqualizer (labView, true, true); //ipf.waveletEqualizer (labView, true, true);