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

Merge branch 'dev' of https://github.com/Beep6581/RawTherapee into dev

Browse Source
This commit is contained in:
heckflosse 2018-11-22 16:12:56 +01:00
commit 6e4e07f8c0
1 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
rtengine/rtthumbnail.cc
View File

@ -62,15 +62,15 @@ bool checkRawImageThumb (const rtengine::RawImage& raw_image)
void scale_colors (rtengine::RawImage *ri, float scale_mul[4], float cblack[4], bool multiThread) void scale_colors (rtengine::RawImage *ri, float scale_mul[4], float cblack[4], bool multiThread)
{ {
DCraw::dcrawImage_t image = ri->get_image(); DCraw::dcrawImage_t image = ri->get_image();
const int height = ri->get_iheight();
const int width = ri->get_iwidth();
const int top_margin = ri->get_topmargin();
const int left_margin = ri->get_leftmargin();
const int raw_width = ri->get_rawwidth();
const bool isFloat = ri->isFloat();
const float * const float_raw_image = ri->get_FloatRawImage();
if (ri->isBayer()) { if (ri->isBayer()) {
const int height = ri->get_iheight();
const int width = ri->get_iwidth();
const bool isFloat = ri->isFloat();
const int top_margin = ri->get_topmargin();
const int left_margin = ri->get_leftmargin();
const int raw_width = ri->get_rawwidth();
const float * const float_raw_image = ri->get_FloatRawImage();
#ifdef _OPENMP #ifdef _OPENMP
#pragma omp parallel for if(multiThread) #pragma omp parallel for if(multiThread)
#endif #endif
@ -110,14 +110,6 @@ void scale_colors (rtengine::RawImage *ri, float scale_mul[4], float cblack[4],
} }
} }
} else if (ri->isXtrans()) { } else if (ri->isXtrans()) {
const int height = ri->get_iheight();
const int width = ri->get_iwidth();
const bool isFloat = ri->isFloat();
const int top_margin = ri->get_topmargin();
const int left_margin = ri->get_leftmargin();
const int raw_width = ri->get_rawwidth();
const float * const float_raw_image = ri->get_FloatRawImage();
#ifdef _OPENMP #ifdef _OPENMP
#pragma omp parallel for if(multiThread) #pragma omp parallel for if(multiThread)
#endif #endif
@ -157,6 +149,20 @@ void scale_colors (rtengine::RawImage *ri, float scale_mul[4], float cblack[4],
image[row * width + col][ccol] = rtengine::CLIP (val); image[row * width + col][ccol] = rtengine::CLIP (val);
} }
} }
} else if (isFloat) {
#ifdef _OPENMP
#pragma omp parallel for if(multiThread)
#endif
for (int row = 0; row < height; ++row) {
for (int col = 0; col < width; ++col) {
for (int i = 0; i < ri->get_colors(); ++i) {
float val = float_raw_image[(row + top_margin) * raw_width + col + left_margin + i];
val -= cblack[i];
val *= scale_mul[i];
image[row * width + col][i] = val;
}
}
}
} else { } else {
const int size = ri->get_iheight() * ri->get_iwidth(); const int size = ri->get_iheight() * ri->get_iwidth();