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

Fixed a crash using NR auto chroma mode in combination with rotation/distortion correction, no Issue

Browse Source
This commit is contained in:
Ingo
2015-01-18 14:48:32 +01:00
parent 09a07513f0
commit d01923fd78
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
rtengine/dcrop.cc
View File

@@ -255,9 +255,11 @@ void Crop::update (int todo) {
//setCropSizes (centerTile_X[poscenterX], centerTile_Y[poscenterY], trafw*skip,trafh*skip , skip, true); //setCropSizes (centerTile_X[poscenterX], centerTile_Y[poscenterY], trafw*skip,trafh*skip , skip, true);
// we only need image reduced to 1/4 here // we only need image reduced to 1/4 here
Imagefloat *provicalc = new Imagefloat ((cropw+1)/2, (croph+1)/2);//for denoise curves int W = origCrop->getWidth();
for(int ii=0;ii<croph;ii+=2){ int H = origCrop->getHeight();
for(int jj=0;jj<cropw;jj+=2){ Imagefloat *provicalc = new Imagefloat ((W+1)/2, (H+1)/2);//for denoise curves
for(int ii=0;ii<H;ii+=2){
for(int jj=0;jj<W;jj+=2){
provicalc->r(ii>>1,jj>>1) = origCrop->r(ii,jj); provicalc->r(ii>>1,jj>>1) = origCrop->r(ii,jj);
provicalc->g(ii>>1,jj>>1) = origCrop->g(ii,jj); provicalc->g(ii>>1,jj>>1) = origCrop->g(ii,jj);
provicalc->b(ii>>1,jj>>1) = origCrop->b(ii,jj); provicalc->b(ii>>1,jj>>1) = origCrop->b(ii,jj);
@@ -492,9 +494,11 @@ void Crop::update (int todo) {
if((noiseLCurve || noiseCCurve ) && skip==1 && denoiseParams.enabled) {//only allocate memory if enabled and skip if((noiseLCurve || noiseCCurve ) && skip==1 && denoiseParams.enabled) {//only allocate memory if enabled and skip
// we only need image reduced to 1/4 here // we only need image reduced to 1/4 here
calclum = new Imagefloat ((cropw+1)/2, (croph+1)/2);//for denoise curves int W = origCrop->getWidth();
for(int ii=0;ii<croph;ii+=2){ int H = origCrop->getHeight();
for(int jj=0;jj<cropw;jj+=2){ calclum = new Imagefloat ((W+1)/2, (H+1)/2);//for denoise curves
for(int ii=0;ii<H;ii+=2){
for(int jj=0;jj<W;jj+=2){
calclum->r(ii>>1,jj>>1) = origCrop->r(ii,jj); calclum->r(ii>>1,jj>>1) = origCrop->r(ii,jj);
calclum->g(ii>>1,jj>>1) = origCrop->g(ii,jj); calclum->g(ii>>1,jj>>1) = origCrop->g(ii,jj);
calclum->b(ii>>1,jj>>1) = origCrop->b(ii,jj); calclum->b(ii>>1,jj>>1) = origCrop->b(ii,jj);