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

Post-merge bugfix

Browse Source
This commit is contained in:
Hombre57 2019-12-08 02:01:03 +01:00
parent c23f976302
commit 9bb19eb1a3
4 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rtengine/improccoordinator.cc
View File

@ -576,8 +576,6 @@ void ImProcCoordinator::updatePreviewImage(int todo, bool panningRelatedChange)
spotprev->copyData(oprevi); spotprev->copyData(oprevi);
} }
readyphase++;
if ((todo & M_HDR) && (params->fattal.enabled || params->dehaze.enabled)) { if ((todo & M_HDR) && (params->fattal.enabled || params->dehaze.enabled)) {
if (fattal_11_dcrop_cache) { if (fattal_11_dcrop_cache) {
delete fattal_11_dcrop_cache; delete fattal_11_dcrop_cache;

4
rtengine/improcfun.h
View File

@ -56,6 +56,8 @@ class Image8;
class Imagefloat; class Imagefloat;
class LabImage; class LabImage;
class wavelet_decomposition; class wavelet_decomposition;
class ImageSource;
class ColorTemp;
namespace procparams namespace procparams
{ {
@ -248,7 +250,7 @@ public:
float MadRgb(const float * DataList, int datalen); float MadRgb(const float * DataList, int datalen);
// spot removal tool // spot removal tool
void removeSpots (Imagefloat* img, ImageSource* imgsrc, const std::vector<SpotEntry> &entries, const PreviewProps &pp, const ColorTemp &currWB, const ColorManagementParams *cmp, int tr); void removeSpots (rtengine::Imagefloat* img, rtengine::ImageSource* imgsrc, const std::vector<procparams::SpotEntry> &entries, const PreviewProps &pp, const rtengine::ColorTemp &currWB, const procparams::ColorManagementParams *cmp, int tr);
// pyramid wavelet // pyramid wavelet
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_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

3
rtengine/spot.cc
View File

@ -21,7 +21,10 @@
#include "alpha.h" #include "alpha.h"
#include "procparams.h" #include "procparams.h"
#include "imagesource.h" #include "imagesource.h"
#include "imagefloat.h"
#include "rt_math.h"
#include <iostream> #include <iostream>
#include <set>
namespace rtengine namespace rtengine
{ {

2
rtgui/editwidgets.h
View File

@ -24,11 +24,11 @@
#include <glibmm/ustring.h> #include <glibmm/ustring.h>
#include "editcoordsys.h" #include "editcoordsys.h"
#include "rtsurface.h"
#include "../rtengine/coord.h" #include "../rtengine/coord.h"
#include "../rtengine/rt_math.h" #include "../rtengine/rt_math.h"
class ObjectMOBuffer; class ObjectMOBuffer;
class RTSurface;
/** @file /** @file
* *