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

Merge branch 'dev' into release-5.3-rc1

Browse Source
This commit is contained in:
Morgan Hardwood
2017-09-30 15:45:50 +02:00
parent 930394ffe8 2f19546c72
commit 2dbd307416
3 changed files with 55 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
rtdata/themes/RawTherapee-GTK3-20_.css
View File

@@ -171,6 +171,7 @@ eventbox.frame {
border-color: #565656;
}
/*** Scrollbar ***************************************/
scrollbar {
background-color: #303030;
}
@@ -181,6 +182,42 @@ scrollbar slider:hover {
background-color: #999999;
}
scrollbar:not(.overlay-indicator).horizontal slider,
scrollbar.horizontal.hovering slider {
min-height: 6px;
min-width: 24px;
}
scrollbar:not(.overlay-indicator).horizontal.fine-tune slider,
scrollbar.horizontal.hovering.fine-tune slider {
min-height: 4px;
border-width: 4px;
margin: 0 -1px;
}
scrollbar.horizontal.overlay-indicator:not(.hovering) slider {
min-width: 24px;
min-height: 3px;
margin: 0 2px;
}
scrollbar:not(.overlay-indicator).vertical slider,
scrollbar.vertical.hovering slider {
min-height: 24px;
min-width: 6px;
}
scrollbar:not(.overlay-indicator).vertical.fine-tune slider,
scrollbar.vertical.hovering.fine-tune slider {
min-width: 4px;
border-width: 4px;
margin: -1px 0;
}
scrollbar.vertical.overlay-indicator:not(.hovering) slider {
min-width: 3px;
min-height: 24px;
margin: 2px 0;
}
/**************************************************/
button {
padding: 0;
min-height: 5px;

29
rtengine/improcfun.cc
View File

@@ -1793,7 +1793,7 @@ void ImProcFunctions::ciecam_02float (CieImage* ncie, float adap, int begh, int
}
float sum = 0.f;
float sumQ = 0.f;
// float sumQ = 0.f;
#ifdef _OPENMP
const int numThreads = min (max (width * height / 65536, 1), omp_get_max_threads());
@@ -1813,7 +1813,9 @@ void ImProcFunctions::ciecam_02float (CieImage* ncie, float adap, int begh, int
hist16Qthr.clear();
}
#pragma omp for reduction(+:sum,sumQ)
// #pragma omp for reduction(+:sum,sumQ)
#pragma omp for reduction(+:sum)
for (int i = 0; i < height; i++)
for (int j = 0; j < width; j++) { //rough correspondence between L and J
@@ -1859,24 +1861,25 @@ void ImProcFunctions::ciecam_02float (CieImage* ncie, float adap, int begh, int
}
//estimation of wh only with La
float whestim = 500.f;
if (la < 200.f) {
whestim = 200.f;
} else if (la < 2500.f) {
whestim = 350.f;
} else {
whestim = 500.f;
}
/*
float whestim = 500.f;
if (la < 200.f) {
whestim = 200.f;
} else if (la < 2500.f) {
whestim = 350.f;
} else {
whestim = 500.f;
}
*/
if (needQ) {
hist16Qthr[CLIP ((int) (32768.f * sqrt ((koef * (lab->L[i][j])) / 32768.f)))]++; //for brightness Q : approximation for Q=wh*sqrt(J/100) J not equal L
//perhaps needs to introduce whestim ??
// hist16Qthr[ (int) (sqrtf ((koef * (lab->L[i][j])) * 32768.f))]++; //for brightness Q : approximation for Q=wh*sqrt(J/100) J not equal L
//hist16Qthr[ (int) (sqrtf ((koef * (lab->L[i][j])) * 32768.f))]++; //for brightness Q : approximation for Q=wh*sqrt(J/100) J not equal L
}
sum += koef * lab->L[i][j]; //evaluate mean J to calculate Yb
sumQ += whestim * sqrt ((koef * (lab->L[i][j])) / 32768.f);
//sumQ += whestim * sqrt ((koef * (lab->L[i][j])) / 32768.f);
//can be used in case of...
}

4
rtgui/lensprofile.cc
View File

@@ -601,7 +601,7 @@ void LensProfilePanel::LFDbHelper::fillLensfunCameras()
camnames[c.getMake()].insert(c.getModel());
if (options.rtSettings.verbose) {
std::cout << " found: " << c.getDisplayString() << std::endl;
std::cout << " found: " << c.getDisplayString().c_str() << std::endl;
}
}
for (auto &p : camnames) {
@@ -630,7 +630,7 @@ void LensProfilePanel::LFDbHelper::fillLensfunLenses()
lenses[make].insert(name);
if (options.rtSettings.verbose) {
std::cout << " found: " << l.getDisplayString() << std::endl;
std::cout << " found: " << l.getDisplayString().c_str() << std::endl;
}
}
for (auto &p : lenses) {