From 5a19632475eda7958d93a9c9ce94fa3841fca7b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fl=C3=B6ssie?= Date: Wed, 25 Sep 2019 11:33:56 +0200 Subject: [PATCH 1/3] Fix non-SSE2 build --- rtengine/color.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/rtengine/color.h b/rtengine/color.h index 1031ca150..97835ba10 100644 --- a/rtengine/color.h +++ b/rtengine/color.h @@ -210,10 +210,12 @@ public: return r * workingspace[1][0] + g * workingspace[1][1] + b * workingspace[1][2]; } +#ifdef __SSE2__ static vfloat rgbLuminance(vfloat r, vfloat g, vfloat b, const vfloat workingspace[3]) { return r * workingspace[0] + g * workingspace[1] + b * workingspace[2]; } +#endif /** * @brief Convert red/green/blue to L*a*b From 277c494fefc69a63ddd970af217ef4499616bdf5 Mon Sep 17 00:00:00 2001 From: Morgan Hardwood Date: Wed, 25 Sep 2019 11:54:30 +0200 Subject: [PATCH 2/3] Downgrade desktop file to Version=1.0, #5470 Version=1.1 caused Travis CI builds to fail. Version 1.1 was necessary only to standardize the Keywords key, but this key is a potential pitfall and unnecessary. --- rtdata/rawtherapee.desktop.in | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/rtdata/rawtherapee.desktop.in b/rtdata/rawtherapee.desktop.in index c6c675c4d..107ce2a42 100644 --- a/rtdata/rawtherapee.desktop.in +++ b/rtdata/rawtherapee.desktop.in @@ -1,6 +1,6 @@ [Desktop Entry] Type=Application -Version=1.1 +Version=1.0 Name=RawTherapee GenericName=Raw Photo Editor GenericName[cs]=Editor raw obrázků @@ -16,5 +16,4 @@ Exec=rawtherapee %f Terminal=false MimeType=image/jpeg;image/png;image/tiff;image/x-adobe-dng;image/x-canon-cr2;image/x-canon-crf;image/x-canon-crw;image/x-fuji-raf;image/x-hasselblad-3fr;image/x-hasselblad-fff;image/x-jpg;image/x-kodak-dcr;image/x-kodak-k25;image/x-kodak-kdc;image/x-leaf-mos;image/x-leica-rwl;image/x-mamiya-mef;image/x-minolta-mrw;image/x-nikon-nef;image/x-nikon-nrw;image/x-olympus-orf;image/x-panasonic-raw;image/x-panasonic-rw2;image/x-pentax-pef;image/x-pentax-raw;image/x-phaseone-iiq;image/x-raw;image/x-rwz;image/x-samsung-srw;image/x-sigma-x3f;image/x-sony-arq;image/x-sony-arw;image/x-sony-sr2;image/x-sony-srf;image/x-tif; Categories=Graphics;Photography;2DGraphics;RasterGraphics;GTK; -Keywords=raw;photo;photography;develop;pp3;graphics; StartupWMClass=rawtherapee From b86b7a4af6f9b7248d9d3af0bc77395475a7721c Mon Sep 17 00:00:00 2001 From: Morgan Hardwood Date: Wed, 25 Sep 2019 12:08:43 +0200 Subject: [PATCH 3/3] Reverted Keywords key in desktop file, #5470 --- rtdata/rawtherapee.desktop.in | 1 + 1 file changed, 1 insertion(+) diff --git a/rtdata/rawtherapee.desktop.in b/rtdata/rawtherapee.desktop.in index 107ce2a42..b059e7d6a 100644 --- a/rtdata/rawtherapee.desktop.in +++ b/rtdata/rawtherapee.desktop.in @@ -16,4 +16,5 @@ Exec=rawtherapee %f Terminal=false MimeType=image/jpeg;image/png;image/tiff;image/x-adobe-dng;image/x-canon-cr2;image/x-canon-crf;image/x-canon-crw;image/x-fuji-raf;image/x-hasselblad-3fr;image/x-hasselblad-fff;image/x-jpg;image/x-kodak-dcr;image/x-kodak-k25;image/x-kodak-kdc;image/x-leaf-mos;image/x-leica-rwl;image/x-mamiya-mef;image/x-minolta-mrw;image/x-nikon-nef;image/x-nikon-nrw;image/x-olympus-orf;image/x-panasonic-raw;image/x-panasonic-rw2;image/x-pentax-pef;image/x-pentax-raw;image/x-phaseone-iiq;image/x-raw;image/x-rwz;image/x-samsung-srw;image/x-sigma-x3f;image/x-sony-arq;image/x-sony-arw;image/x-sony-sr2;image/x-sony-srf;image/x-tif; Categories=Graphics;Photography;2DGraphics;RasterGraphics;GTK; +Keywords=raw;photo;photography;develop;pp3;graphics; StartupWMClass=rawtherapee