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

Fixed some bugs in Noise Reduction, Issue 2557 #254

Browse Source
This commit is contained in:
Ingo 2015-02-05 01:08:43 +01:00
parent b05fa5d6a1
commit 9e3ea2924c
2 changed files with 44 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
rtengine/FTblockDN.cc
View File

@ -380,7 +380,7 @@ SSEFUNCTION void ImProcFunctions::RGB_denoise(int kall, Imagefloat * src, Imagef
if (dnparams.luma==0 && dnparams.chroma==0 && !dnparams.median && !noiseLCurve && !noiseCCurve) { if (dnparams.luma==0 && dnparams.chroma==0 && !dnparams.median && !noiseLCurve && !noiseCCurve) {
//nothing to do; copy src to dst or do nothing in case src == dst //nothing to do; copy src to dst or do nothing in case src == dst
if(src != dst) if(src != dst)
memcpy(dst->data,src->data,dst->width*dst->height*3*sizeof(float)); src->copyData(dst);
if(calclum) { if(calclum) {
delete calclum; delete calclum;
calclum = NULL; calclum = NULL;
@ -594,8 +594,15 @@ do {
dsttmp = dst; dsttmp = dst;
else { else {
dsttmp = new Imagefloat(imwidth,imheight); dsttmp = new Imagefloat(imwidth,imheight);
for (int n=0; n<3*imwidth*imheight; n++) #ifdef _OPENMP
dsttmp->data[n] = 0; #pragma omp parallel for
#endif
for(int i=0;i<imheight;i++)
for(int j=0;j<imwidth;j++) {
dsttmp->r(i,j) = 0.f;
dsttmp->g(i,j) = 0.f;
dsttmp->b(i,j) = 0.f;
}
} }
//now we have tile dimensions, overlaps //now we have tile dimensions, overlaps
@ -685,7 +692,7 @@ do {
int pos; int pos;
float* noisevarlum; float* noisevarlum;
float* noisevarchrom; float* noisevarchrom;
if(numtiles == 1 && isRAW) { if(numtiles == 1 && isRAW && (useNoiseCCurve || useNoiseLCurve)) {
noisevarlum = lumcalcBuffer; noisevarlum = lumcalcBuffer;
noisevarchrom = ccalcBuffer; noisevarchrom = ccalcBuffer;
} else { } else {
@ -905,6 +912,12 @@ do {
if(nrQuality == QUALITY_HIGH) if(nrQuality == QUALITY_HIGH)
levwav += settings->nrwavlevel;//increase level for enhanced mode levwav += settings->nrwavlevel;//increase level for enhanced mode
if(levwav>8) levwav=8; if(levwav>8) levwav=8;
int minsizetile=min(tilewidth, tileheight);
int maxlev2=8;
if(minsizetile < 256) maxlev2 = 7;
if(minsizetile < 128) maxlev2 = 6;
if(minsizetile < 64) maxlev2 = 5;
levwav=min(maxlev2,levwav);
// if (settings->verbose) printf("levwavelet=%i noisevarA=%f noisevarB=%f \n",levwav, noisevarab_r, noisevarab_b ); // if (settings->verbose) printf("levwavelet=%i noisevarA=%f noisevarB=%f \n",levwav, noisevarab_r, noisevarab_b );
Ldecomp = new wavelet_decomposition (labdn->L[0], labdn->W, labdn->H, levwav, 1, 1, max(1,denoiseNestedLevels)); Ldecomp = new wavelet_decomposition (labdn->L[0], labdn->W, labdn->H, levwav, 1, 1, max(1,denoiseNestedLevels));
@ -1400,7 +1413,7 @@ do {
}//end of tile row }//end of tile row
}//end of tile loop }//end of tile loop
if(numtiles > 1 || !isRAW) { if(numtiles > 1 || !isRAW || (!useNoiseCCurve && !useNoiseLCurve)) {
delete [] noisevarlum; delete [] noisevarlum;
delete [] noisevarchrom; delete [] noisevarchrom;
} }
@ -1419,18 +1432,21 @@ omp_set_nested(oldNested);
//copy denoised image to output //copy denoised image to output
if(numtiles>1) { if(numtiles>1) {
if(!memoryAllocationFailed) if(!memoryAllocationFailed)
memcpy (dst->data, dsttmp->data, 3*dst->width*dst->height*sizeof(float)); dsttmp->copyData(dst);
else if(dst != src) else if(dst != src)
memcpy (dst->data, src->data, 3*dst->width*dst->height*sizeof(float)); src->copyData(dst);
delete dsttmp; delete dsttmp;
} }
if (!isRAW && !memoryAllocationFailed) {//restore original image gamma if (!isRAW && !memoryAllocationFailed) {//restore original image gamma
#ifdef _OPENMP #ifdef _OPENMP
#pragma omp parallel for #pragma omp parallel for
#endif #endif
for (int i=0; i<3*dst->width*dst->height; i++) { for(int i=0;i<dst->height;i++)
dst->data[i] = Color::gammatab_srgb[ dst->data[i] ]; for(int j=0;j<dst->width;j++) {
} dst->r(i,j) = Color::gammatab_srgb[ dst->r(i,j) ];
dst->g(i,j) = Color::gammatab_srgb[ dst->g(i,j) ];
dst->b(i,j) = Color::gammatab_srgb[ dst->b(i,j) ];
}
} }
if(denoiseLuminance) { if(denoiseLuminance) {

3
rtengine/iimage.h
View File

@ -519,9 +519,10 @@ namespace rtengine {
int rowstride; // Plan size, in bytes (all padding bytes included) int rowstride; // Plan size, in bytes (all padding bytes included)
int planestride; // Row length, in bytes (padding bytes included) int planestride; // Row length, in bytes (padding bytes included)
protected:
T* data;
public: public:
T* data;
PlanarPtr<T> r; PlanarPtr<T> r;
PlanarPtr<T> g; PlanarPtr<T> g;
PlanarPtr<T> b; PlanarPtr<T> b;