Small image pipeline cleanups (cross checked by Emil, so no issue in list)
This commit is contained in:
@@ -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);
|
||||
}
|
||||
|
||||
|
||||
|
@@ -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) {
|
||||
|
@@ -34,7 +34,6 @@ class LabImage {
|
||||
float** b;
|
||||
|
||||
LabImage (int w, int h);
|
||||
LabImage (Image16* im);
|
||||
~LabImage ();
|
||||
};
|
||||
}
|
||||
|
@@ -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);
|
||||
|
Reference in New Issue
Block a user