Merge branch 'master' into clang-tidy

This commit is contained in:
Flössie
2016-10-18 17:48:50 +02:00
85 changed files with 6870 additions and 2817 deletions

View File

@@ -65,9 +65,7 @@ public:
protected:
bool initEq1;
bool _isDouble;
#ifndef NDEBUG
unsigned int part[5];
#endif
public:
Threshold (T bottom, T top, bool startAtOne)
{
@@ -969,6 +967,7 @@ public:
Glib::ustring working;
Glib::ustring output;
RenderingIntent outputIntent;
bool outputBPC;
static const Glib::ustring NoICMString;
Glib::ustring gamma;