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

Merge branch 'dev' into cppcheck

Browse Source
This commit is contained in:
Ingo Weyrich
2019-08-07 15:33:16 +02:00
parent 4c99c9cf01 aa3f8d81bc
commit 27f921405c
6 changed files with 344 additions and 654 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
rtengine/array2D.h
View File

@@ -214,6 +214,12 @@ public:
return ptr;
}
// use as pointer to T**
operator const T* const *()
{
return ptr;
}
// use as pointer to data
operator T*()
{

6
rtengine/camconst.json
View File

@@ -1725,9 +1725,15 @@ Camera constants:
{ // Quality B,
"make_model": "OLYMPUS TG-5",
"dcraw_matrix": [ 10899,-3833,-1082,-2112,10736,1575,-267,1452,5269 ], // DNG_V9.12 D65
"raw_crop": [ 0, 0, -18, 0 ], // 18 pixels at right are garbage
"ranges": { "white": 4050 } // safe for worst case detected, nominal is 4093
},
{ // Quality C, only raw crop
"make_model": "OLYMPUS TG-6",
"raw_crop": [ 0, 0, -24, 0 ] // 24 pixels at right are garbage
},
{ // Quality C, only green equilibration
"make_model" : ["OLYMPUS E-3", "OLYMPUS E-520"],
"global_green_equilibration" : true

869
rtengine/dirpyr_equalizer.cc
View File

File diff suppressed because it is too large Load Diff

2
rtengine/helpersse2.h
View File

@@ -29,7 +29,7 @@ typedef __m128 vfloat;
typedef __m128i vint2;
//
#define LVF(x) _mm_load_ps((float*)&x)
#define LVF(x) _mm_load_ps((const float*)&x)
#define LVFU(x) _mm_loadu_ps(&x)
#define STVF(x,y) _mm_store_ps(&x,y)
#define STVFU(x,y) _mm_storeu_ps(&x,y)

2
rtengine/improcfun.cc
View File

@@ -1720,7 +1720,7 @@ void ImProcFunctions::ciecam_02float (CieImage* ncie, float adap, int pW, int pw
float t_l = static_cast<float> (params->dirpyrequalizer.hueskin.getTopLeft()) / 100.0f;
float t_r = static_cast<float> (params->dirpyrequalizer.hueskin.getTopRight()) / 100.0f;
lab->deleteLab();
dirpyr_equalizercam (ncie, ncie->sh_p, ncie->sh_p, ncie->W, ncie->H, ncie->h_p, ncie->C_p, params->dirpyrequalizer.mult, params->dirpyrequalizer.threshold, params->dirpyrequalizer.skinprotect, true, b_l, t_l, t_r, scale); //contrast by detail adapted to CIECAM
dirpyr_equalizercam (ncie, ncie->sh_p, ncie->sh_p, ncie->W, ncie->H, ncie->h_p, ncie->C_p, params->dirpyrequalizer.mult, params->dirpyrequalizer.threshold, params->dirpyrequalizer.skinprotect, b_l, t_l, t_r, scale); //contrast by detail adapted to CIECAM
lab->reallocLab();
}

7
rtengine/improcfun.h
View File

@@ -332,11 +332,8 @@ public:
float MadRgb(const float * DataList, int datalen);
// pyramid wavelet
void dirpyr_equalizer(float ** src, float ** dst, int srcwidth, int srcheight, float ** l_a, float ** l_b, const double * mult, const double dirpyrThreshold, const double skinprot, float b_l, float t_l, float t_r, int scale); //Emil's directional pyramid wavelet
void dirpyr_equalizercam(CieImage* ncie, float ** src, float ** dst, int srcwidth, int srcheight, float ** h_p, float ** C_p, const double * mult, const double dirpyrThreshold, const double skinprot, bool execdir, float b_l, float t_l, float t_r, int scale); //Emil's directional pyramid wavelet
void dirpyr_channel(float ** data_fine, float ** data_coarse, int width, int height, int level, int scale);
void idirpyr_eq_channel(float ** data_coarse, float ** data_fine, float ** buffer, int width, int height, int level, float multi[6], const double dirpyrThreshold, float ** l_a_h, float ** l_b_c, const double skinprot, float b_l, float t_l, float t_r);
void idirpyr_eq_channelcam(float ** data_coarse, float ** data_fine, float ** buffer, int width, int height, int level, float multi[6], const double dirpyrThreshold, float ** l_a_h, float ** l_b_c, const double skinprot, float b_l, float t_l, float t_r);
void dirpyr_equalizer(const float * const * src, float ** dst, int srcwidth, int srcheight, const float * const * l_a, const float * const * l_b, const double * mult, double dirpyrThreshold, double skinprot, float b_l, float t_l, float t_r, int scale); //Emil's directional pyramid wavelet
void dirpyr_equalizercam(const CieImage* ncie, float ** src, float ** dst, int srcwidth, int srcheight, const float * const * h_p, const float * const * C_p, const double * mult, const double dirpyrThreshold, const double skinprot, float b_l, float t_l, float t_r, int scale); //Emil's directional pyramid wavelet
void defringe(LabImage* lab);
void defringecam(CieImage* ncie);
void badpixcam(CieImage* ncie, double rad, int thr, int mode, float chrom, bool hotbad);