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

Fix segfault when Flatfield blur radius == 0

Browse Source
This commit is contained in:
heckflosse 2016-06-12 20:56:55 +02:00
parent 4a1fb9ae4a
commit c11465e46a
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
rtengine/rawimagesource.cc
View File

@ -3042,10 +3042,17 @@ void RawImageSource::copyOriginalPixels(const RAWParams &raw, RawImage *src, Raw
SSEFUNCTION void RawImageSource::cfaboxblur(RawImage *riFlatFile, float* cfablur, const int boxH, const int boxW) SSEFUNCTION void RawImageSource::cfaboxblur(RawImage *riFlatFile, float* cfablur, const int boxH, const int boxW)
{ {
if(boxW == 0 && boxH == 0) { // nothing to blur
memcpy(cfablur, riFlatFile->data[0], W*H*sizeof(float));
return;
}
float *tmpBuffer = nullptr; float *tmpBuffer = nullptr;
float *cfatmp = nullptr; float *cfatmp = nullptr;
float *srcVertical = nullptr; float *srcVertical = nullptr;
if(boxH > 0 && boxW > 0) { if(boxH > 0 && boxW > 0) {
// we need a temporary buffer if we have to blur both directions // we need a temporary buffer if we have to blur both directions
tmpBuffer = (float (*)) calloc (H * W, sizeof * tmpBuffer); tmpBuffer = (float (*)) calloc (H * W, sizeof * tmpBuffer);
@ -3065,7 +3072,6 @@ SSEFUNCTION void RawImageSource::cfaboxblur(RawImage *riFlatFile, float* cfablur
srcVertical = cfatmp; srcVertical = cfatmp;
} }
#ifdef _OPENMP #ifdef _OPENMP
#pragma omp parallel #pragma omp parallel
#endif #endif