Merge branch 'dev' into spot-removal-tool

This commit is contained in:
Hombre
2019-09-14 23:31:02 +02:00
524 changed files with 2611 additions and 739 deletions

View File

@@ -14,7 +14,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with RawTherapee. If not, see <http://www.gnu.org/licenses/>.
* along with RawTherapee. If not, see <https://www.gnu.org/licenses/>.
*/
#ifndef __TOOLPANELCCORD__
#define __TOOLPANELCCORD__
@@ -78,6 +78,7 @@
#include "colortoning.h"
#include "filmsimulation.h"
#include "prsharpening.h"
#include "pdsharpening.h"
#include "fattaltonemap.h"
#include "localcontrast.h"
#include "softlight.h"
@@ -159,7 +160,7 @@ protected:
FattalToneMapping *fattal;
MetaDataPanel* metadata;
FilmNegative* filmNegative;
PdSharpening* pdSharpening;
std::vector<PParamsChangeListener*> paramcListeners;
rtengine::StagedImageProcessor* ipc;
@@ -247,7 +248,6 @@ public:
// FilmNegProvider interface
void imageTypeChanged (bool isRaw, bool isBayer, bool isXtrans, bool isMono = false) override;
// void autoContrastChanged (double autoContrast);
// profilechangelistener interface
void profileChange(
const rtengine::procparams::PartialProfile* nparams,