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

Merge branch 'dev' into rtsurface-cleanup

Browse Source
This commit is contained in:
Flössie
2019-03-25 19:09:15 +01:00
parent 363385a838 14020ed356
commit fc10dc5f77
105 changed files with 5860 additions and 2805 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
rtengine/improcfun.cc
View File

@@ -17,38 +17,34 @@
* along with RawTherapee. If not, see <http://www.gnu.org/licenses/>.
*/
#include <cmath>
#include <glib.h>
#include <glibmm.h>
#ifdef _OPENMP
#include <omp.h>
#endif
#include "improcfun.h"
#include "alignedbuffer.h"
#include "calc_distort.h"
#include "ciecam02.h"
#include "clutstore.h"
#include "color.h"
#include "rtengine.h"
#include "improcfun.h"
#include "curves.h"
#include "EdgePreservingDecomposition.h"
#include "iccmatrices.h"
#include "mytime.h"
#include "iccstore.h"
#include "imagesource.h"
#include "improccoordinator.h"
#include "mytime.h"
#include "procparams.h"
#include "rt_math.h"
#include "rtengine.h"
#include "rtthumbnail.h"
#include "StopWatch.h"
#include "utils.h"
#include "../rtgui/edit.h"
#include "../rtgui/guiutils.h"
#include "iccmatrices.h"
#include "color.h"
#include "calc_distort.h"
#include "rt_math.h"
#include "EdgePreservingDecomposition.h"
#include "improccoordinator.h"
#include "clutstore.h"
#include "ciecam02.h"
#include "StopWatch.h"
#include "procparams.h"
#include "../rtgui/ppversion.h"
#include "../rtgui/guiutils.h"
#include "../rtgui/editcallbacks.h"
#undef CLIPD
#define CLIPD(a) ((a)>0.0f?((a)<1.0f?(a):1.0f):0.0f)
@@ -185,7 +181,7 @@ void proPhotoBlue(float *rtemp, float *gtemp, float *btemp, int istart, int tH,
float r = rtemp[ti * tileSize + tj + k];
float g = gtemp[ti * tileSize + tj + k];
float b = btemp[ti * tileSize + tj + k];
if ((r == 0.0f || g == 0.0f) && rtengine::min(r, g, b) >= 0.f) {
float h, s, v;
Color::rgb2hsv (r, g, b, h, s, v);
@@ -2525,7 +2521,7 @@ void ImProcFunctions::rgbProc (Imagefloat* working, LabImage* lab, PipetteBuffer
float tmpr[4] ALIGNED16;
float tmpg[4] ALIGNED16;
float tmpb[4] ALIGNED16;
for (int i = istart, ti = 0; i < tH; i++, ti++) {
int j = jstart, tj = 0;
#ifdef __SSE2__
@@ -3227,7 +3223,7 @@ void ImProcFunctions::rgbProc (Imagefloat* working, LabImage* lab, PipetteBuffer
}
//softLight(rtemp, gtemp, btemp, istart, jstart, tW, tH, TS);
if (!blackwhite) {
if (editImgFloat || editWhatever) {
for (int i = istart, ti = 0; i < tH; i++, ti++) {
@@ -3702,7 +3698,7 @@ void ImProcFunctions::retreavergb (float &r, float &g, float &b)
/**
* @brief Interpolate by decreasing with a parabol k = aa*v*v + bb*v +c v[0..1]
* @param reducac val ue of the reduction in the middle of the range
* @param reducac value of the reduction in the middle of the range
* @param vinf value [0..1] for beginning decrease
* @param aa second degree parameter
* @param bb first degree parameter
@@ -3724,7 +3720,7 @@ void ImProcFunctions::secondeg_end (float reducac, float vinf, float &aa, float
/**
* @brief Interpolate by increasing with a parabol k = aa*v*v + bb*v v[0..1]
* @param reducac val ue of the reduction in the middle of the range
* @param reducac value of the reduction in the middle of the range
* @param vend value [0..1] for beginning increase
* @param aa second degree parameter
* @param bb first degree parameter
@@ -4089,7 +4085,7 @@ void ImProcFunctions::labtoning (float r, float g, float b, float &ro, float &go
ro = CLIP(r);
go = CLIP(g);
bo = CLIP(b);
float realL;
float h, s, l;
Color::rgb2hsl (ro, go, bo, h, s, l);
@@ -4228,7 +4224,7 @@ void ImProcFunctions::chromiLuminanceCurve (PipetteBuffer *pipetteBuffer, int pW
}
//-------------------------------------------------------------------------
if (!params->labCurve.enabled) {
if (editPipette && (editID == EUID_Lab_LCurve || editID == EUID_Lab_aCurve || editID == EUID_Lab_bCurve || editID == EUID_Lab_LHCurve || editID == EUID_Lab_CHCurve || editID == EUID_Lab_HHCurve || editID == EUID_Lab_CLCurve || editID == EUID_Lab_CCurve || editID == EUID_Lab_LCCurve)) {
// fill pipette buffer with zeros to avoid crashes