Line endings
This commit is contained in:
@@ -30,7 +30,7 @@
|
||||
#include "../rtgui/multilangmgr.h"
|
||||
#include "procparams.h"
|
||||
#include "sleef.c"
|
||||
#include "opthelper.h"
|
||||
#include "opthelper.h"
|
||||
|
||||
namespace rtengine {
|
||||
|
||||
@@ -78,10 +78,10 @@ SSEFUNCTION void RawImageSource::amaze_demosaic_RT(int winx, int winy, int winw,
|
||||
|
||||
volatile double progress = 0.0;
|
||||
|
||||
// %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
|
||||
|
||||
// Issue 1676
|
||||
// Moved from inside the parallel section
|
||||
// %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
|
||||
|
||||
// Issue 1676
|
||||
// Moved from inside the parallel section
|
||||
if (plistener) {
|
||||
plistener->setProgressStr (Glib::ustring::compose(M("TP_RAW_DMETHOD_PROGRESSBAR"), RAWParams::BayerSensor::methodstring[RAWParams::BayerSensor::amaze]));
|
||||
plistener->setProgress (0.0);
|
||||
@@ -201,10 +201,10 @@ SSEFUNCTION void RawImageSource::amaze_demosaic_RT(int winx, int winy, int winw,
|
||||
|
||||
// Main algorithm: Tile loop
|
||||
//#pragma omp parallel for shared(rawData,height,width,red,green,blue) private(top,left) schedule(dynamic)
|
||||
//code is openmp ready; just have to pull local tile variable declarations inside the tile loop
|
||||
|
||||
// Issue 1676
|
||||
// use collapse(2) to collapse the 2 loops to one large loop, so there is better scaling
|
||||
//code is openmp ready; just have to pull local tile variable declarations inside the tile loop
|
||||
|
||||
// Issue 1676
|
||||
// use collapse(2) to collapse the 2 loops to one large loop, so there is better scaling
|
||||
#pragma omp for schedule(dynamic) collapse(2) nowait
|
||||
for (top=winy-16; top < winy+height; top += TS-32)
|
||||
for (left=winx-16; left < winx+width; left += TS-32) {
|
||||
|
||||
Reference in New Issue
Block a user