Merge branch 'dev' into testoutputprofile

This commit is contained in:
Hombre
2018-06-14 21:47:14 +02:00
105 changed files with 3703 additions and 2470 deletions

View File

@@ -76,6 +76,7 @@ protected:
RenderingIntent monitorIntent;
bool softProof;
bool gamutCheck;
bool sharpMask;
int scale;
bool highDetailPreprocessComputed;
@@ -272,7 +273,7 @@ public:
void getMonitorProfile (Glib::ustring& profile, RenderingIntent& intent) const;
void setSoftProofing (bool softProof, bool gamutCheck);
void getSoftProofing (bool &softProof, bool &gamutCheck);
void setSharpMask (bool sharpMask);
bool updateTryLock ()
{
return updaterThreadStart.trylock();