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

First mockup to improve pyramids

Browse Source
This commit is contained in:
Ingo Weyrich 2020-06-30 15:29:21 +02:00
parent 7a3958e976
commit 15c4f7c2f8
2 changed files with 37 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
rtengine/LUT.h
View File

@ -61,6 +61,7 @@
#include <cstring>
#include <cstdint>
#include <cassert>
#include <vector>
#ifndef NDEBUG
#include <fstream>
@ -138,6 +139,38 @@ public:
clear();
}
}
LUT(const std::vector<T> input, int flags = LUT_CLIP_BELOW | LUT_CLIP_ABOVE)
{
#ifndef NDEBUG
if (input.size() <= 0) {
printf("s<=0!\n");
}
assert (input.size() > 0);
#endif
dirty = true;
clip = flags;
// Add a few extra elements so [](vfloat) won't access out-of-bounds memory.
// The routine would still produce the right answer, but might cause issues
// with address/heap checking programs.
data = new T[input.size() + 3];
owner = 1;
size = input.size();
upperBound = size - 1;
maxs = size - 2;
maxsf = (float)maxs;
#ifdef __SSE2__
maxsv = F2V( maxs );
sizeiv = _mm_set1_epi32( (int)(size - 1) );
sizev = F2V( size - 1 );
#endif
for (size_t i = 0; i < input.size(); ++i) {
data[i] = input[i];
}
}
void operator ()(int s, int flags = LUT_CLIP_BELOW | LUT_CLIP_ABOVE, bool initZero = false)
{
#ifndef NDEBUG

30
rtengine/iplocallab.cc
View File

@ -7010,6 +7010,7 @@ void ImProcFunctions::wavcont(const struct local_params& lp, float ** tmp, wavel
Evaluate2(wdspot, mean, meanN, sigma, sigmaN, MaxP, MaxN, numThreads);
if (process == 1 && loclevwavCurve && loclevwavutili) { //blur
StopWatch Stop1("blur");
array2D<float> templevel(W_L, H_L);
for (int dir = 1; dir < 4; ++dir) {
for (int level = level_bl; level < maxlvl; ++level) {
@ -7018,36 +7019,13 @@ void ImProcFunctions::wavcont(const struct local_params& lp, float ** tmp, wavel
constexpr float offs = 1.f;
float mea[10];
calceffect(level, mean, sigma, mea, effect, offs);
LUTf meaLut({0.05f, 0.2f, 0.7f, 1.f, 1.f, 0.8f, 0.5f, 0.3f, 0.2f, 0.1f, 0.05f});
const float lutFactor = (meaLut.getSize() - 1) / mea[9];
#ifdef _OPENMP
#pragma omp parallel for if (multiThread)
#endif
for (int co = 0; co < H_L * W_L; co++) {
const float WavCL = std::fabs(WavL[co]);
if (WavCL < mea[0]) {
beta[co] = 0.05f;
} else if (WavCL < mea[1]) {
beta[co] = 0.2f;
} else if (WavCL < mea[2]) {
beta[co] = 0.7f;
} else if (WavCL < mea[3]) {
beta[co] = 1.f; //standard
} else if (WavCL < mea[4]) {
beta[co] = 1.f;
} else if (WavCL < mea[5]) {
beta[co] = 0.8f; //+sigma
} else if (WavCL < mea[6]) {
beta[co] = 0.5f;
} else if (WavCL < mea[7]) {
beta[co] = 0.3f;
} else if (WavCL < mea[8]) {
beta[co] = 0.2f; // + 2 sigma
} else if (WavCL < mea[9]) {
beta[co] = 0.1f;
} else {
beta[co] = 0.05f;
}
beta[co] = meaLut[std::fabs(WavL[co]) * lutFactor];
}
const float klev = 0.25f * loclevwavCurve[level * 55.5f];