Merge branch 'dev' into newlocallab

2019-09-25 12:43:15 +02:00
parent b860766a73 b86b7a4af6
commit 7fc3d99323
2 changed files with 3 additions and 1 deletions
--- 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ů
--- a/rtengine/color.h
+++ b/rtengine/color.h
@@ -213,10 +213,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