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

Merge branch 'dev' into spot-removal-tool

Browse Source
This commit is contained in:
Hombre57
2019-12-08 00:37:54 +01:00
parent 1cf62a2a65 ba36a92240
commit c23f976302
463 changed files with 16158 additions and 10338 deletions
Download Patch File Download Diff File Expand all files Collapse all files

110
rtengine/iimage.h
View File

@@ -16,17 +16,19 @@
* You should have received a copy of the GNU General Public License
* along with RawTherapee. If not, see <https://www.gnu.org/licenses/>.
*/
#ifndef _IIMAGE_
#define _IIMAGE_
#pragma once
#include <glibmm.h>
#include <vector>
#include "rt_math.h"
#include <glibmm/ustring.h>
#include <lcms2.h>
#include "alignedbuffer.h"
#include "coord2d.h"
#include "imagedimensions.h"
#include "LUT.h"
#include "coord2d.h"
#include "color.h"
#include "rt_math.h"
#include "../rtgui/threadutils.h"
#define TR_NONE 0
@@ -57,6 +59,7 @@ extern const char sImage16[];
extern const char sImagefloat[];
int getCoarseBitMask(const procparams::CoarseTransformParams& coarse);
const LUTf& getigammatab();
enum TypeInterpolation { TI_Nearest, TI_Bilinear };
@@ -991,17 +994,35 @@ public:
histogram(65536 >> histcompr);
histogram.clear();
const LUTf& igammatab = getigammatab();
for (int i = 0; i < height; i++)
for (int j = 0; j < width; j++) {
float r_, g_, b_;
convertTo<T, float>(r(i, j), r_);
convertTo<T, float>(g(i, j), g_);
convertTo<T, float>(b(i, j), b_);
histogram[(int)Color::igamma_srgb (r_) >> histcompr]++;
histogram[(int)Color::igamma_srgb (g_) >> histcompr]++;
histogram[(int)Color::igamma_srgb (b_) >> histcompr]++;
#ifdef _OPENMP
#pragma omp parallel
#endif
{
LUTu histThr(histogram.getSize());
histThr.clear();
#ifdef _OPENMP
#pragma omp for schedule(dynamic,16) nowait
#endif
for (int i = 0; i < height; i++) {
for (int j = 0; j < width; j++) {
float r_, g_, b_;
convertTo<T, float>(r(i, j), r_);
convertTo<T, float>(g(i, j), g_);
convertTo<T, float>(b(i, j), b_);
histThr[static_cast<int>(igammatab[r_]) >> histcompr]++;
histThr[static_cast<int>(igammatab[g_]) >> histcompr]++;
histThr[static_cast<int>(igammatab[b_]) >> histcompr]++;
}
}
#ifdef _OPENMP
#pragma omp critical
#endif
{
histogram += histThr;
}
}
}
void computeHistogramAutoWB (double &avg_r, double &avg_g, double &avg_b, int &n, LUTu &histogram, const int compression) const override
@@ -1009,16 +1030,16 @@ public:
histogram.clear();
avg_r = avg_g = avg_b = 0.;
n = 0;
const LUTf& igammatab = getigammatab();
for (unsigned int i = 0; i < (unsigned int)(height); i++)
for (unsigned int j = 0; j < (unsigned int)(width); j++) {
float r_, g_, b_;
convertTo<T, float>(r(i, j), r_);
convertTo<T, float>(g(i, j), g_);
convertTo<T, float>(b(i, j), b_);
int rtemp = Color::igamma_srgb (r_);
int gtemp = Color::igamma_srgb (g_);
int btemp = Color::igamma_srgb (b_);
int rtemp = igammatab[r_];
int gtemp = igammatab[g_];
int btemp = igammatab[b_];
histogram[rtemp >> compression]++;
histogram[gtemp >> compression] += 2;
@@ -1045,6 +1066,9 @@ public:
int n = 0;
//int p = 6;
#ifdef _OPENMP
#pragma omp parallel for reduction(+:avg_r,avg_g,avg_b,n) schedule(dynamic,16)
#endif
for (unsigned int i = 0; i < (unsigned int)(height); i++)
for (unsigned int j = 0; j < (unsigned int)(width); j++) {
float r_, g_, b_;
@@ -1617,17 +1641,35 @@ public:
histogram(65536 >> histcompr);
histogram.clear();
const LUTf& igammatab = getigammatab();
for (int i = 0; i < height; i++)
for (int j = 0; j < width; j++) {
float r_, g_, b_;
convertTo<T, float>(r(i, j), r_);
convertTo<T, float>(g(i, j), g_);
convertTo<T, float>(b(i, j), b_);
histogram[(int)Color::igamma_srgb (r_) >> histcompr]++;
histogram[(int)Color::igamma_srgb (g_) >> histcompr]++;
histogram[(int)Color::igamma_srgb (b_) >> histcompr]++;
#ifdef _OPENMP
#pragma omp parallel
#endif
{
LUTu histThr(histogram.getSize());
histThr.clear();
#ifdef _OPENMP
#pragma omp for schedule(dynamic,16) nowait
#endif
for (int i = 0; i < height; i++) {
for (int j = 0; j < width; j++) {
float r_, g_, b_;
convertTo<T, float>(r(i, j), r_);
convertTo<T, float>(g(i, j), g_);
convertTo<T, float>(b(i, j), b_);
histThr[static_cast<int>(igammatab[r_]) >> histcompr]++;
histThr[static_cast<int>(igammatab[g_]) >> histcompr]++;
histThr[static_cast<int>(igammatab[b_]) >> histcompr]++;
}
}
#ifdef _OPENMP
#pragma omp critical
#endif
{
histogram += histThr;
}
}
}
void computeHistogramAutoWB (double &avg_r, double &avg_g, double &avg_b, int &n, LUTu &histogram, const int compression) const override
@@ -1635,6 +1677,7 @@ public:
histogram.clear();
avg_r = avg_g = avg_b = 0.;
n = 0;
const LUTf& igammatab = getigammatab();
for (unsigned int i = 0; i < (unsigned int)(height); i++)
for (unsigned int j = 0; j < (unsigned int)(width); j++) {
@@ -1642,9 +1685,9 @@ public:
convertTo<T, float>(r(i, j), r_);
convertTo<T, float>(g(i, j), g_);
convertTo<T, float>(b(i, j), b_);
int rtemp = Color::igamma_srgb (r_);
int gtemp = Color::igamma_srgb (g_);
int btemp = Color::igamma_srgb (b_);
int rtemp = igammatab[r_];
int gtemp = igammatab[g_];
int btemp = igammatab[b_];
histogram[rtemp >> compression]++;
histogram[gtemp >> compression] += 2;
@@ -1671,6 +1714,9 @@ public:
int n = 0;
//int p = 6;
#ifdef _OPENMP
#pragma omp parallel for reduction(+:avg_r,avg_g,avg_b,n) schedule(dynamic,16)
#endif
for (unsigned int i = 0; i < (unsigned int)(height); i++)
for (unsigned int j = 0; j < (unsigned int)(width); j++) {
float r_, g_, b_;
@@ -1861,5 +1907,3 @@ public:
};
}
#endif