]> granicus.if.org Git - imagemagick/commitdiff
Fixed argument order of Contrast and ConvertHSBToRGB implementation in OpenCL.
authordirk <dirk@git.imagemagick.org>
Sat, 13 Aug 2016 23:09:51 +0000 (01:09 +0200)
committerdirk <dirk@git.imagemagick.org>
Sat, 13 Aug 2016 23:10:51 +0000 (01:10 +0200)
MagickCore/accelerate-kernels-private.h

index 5ed4da4c39f99d6c7fd86ee2814c82c5122626f5..7c60b7e91719902231af648c20e1875fd9f477c6 100644 (file)
@@ -1052,8 +1052,8 @@ OPENCL_ENDIF()
   inline float4 ConvertHSBToRGB(const float4 pixel)
   {
     float hue=pixel.x;
-    float brightness=pixel.z;
     float saturation=pixel.y;
+    float brightness=pixel.z;
 
     float4 result=pixel;
 
@@ -1102,16 +1102,16 @@ OPENCL_ENDIF()
       }
       else
       {
-        result.x=ClampToQuantum(QuantumRange*q);
-        result.y=ClampToQuantum(QuantumRange*brightness);
+        result.x=ClampToQuantum(QuantumRange*brightness);
+        result.y=ClampToQuantum(QuantumRange*t);
         result.z=ClampToQuantum(QuantumRange*p);
       }
     }
     return(result);
   }
 
-  __kernel void Contrast(__global CLQuantum *image,const int sign,
-    const unsigned int number_channels)
+  __kernel void Contrast(__global CLQuantum *image,
+    const unsigned int number_channels,const int sign)
   {
     const int x=get_global_id(0);
     const int y=get_global_id(1);