(no commit message)

[imagemagick] / magick / pixel.h

diff --git a/magick/pixel.h b/magick/pixel.h
index 278d679c91d3acf6f19696147e449005ff1e8600..3e6da4f4a44e9b6e8459f3f126e66aee6f86c101 100644 (file)
--- a/magick/pixel.h
+++ b/magick/pixel.h
@@ -28,7 +28,7 @@ extern "C" {
 #define ClampRedPixelComponent(pixel) ClampToQuantum((pixel)->red)
 #define ClampGreenPixelComponent(pixel) ClampToQuantum((pixel)->green)
 #define ClampBluePixelComponent(pixel) ClampToQuantum((pixel)->blue)
-#define ClampIndexPixelComponent(pixel) ClampToQuantum((pixel)->index)
+#define ClampIndexPixelComponent(indexes) ClampToQuantum(*(indexes))
 #define ClampOpacityPixelComponent(pixel) ClampToQuantum((pixel)->opacity)
 #define GetAlphaPixelComponent(pixel) (QuantumRange-(pixel)->opacity)
 #define GetBlackPixelComponent(index) (*(index))
@@ -38,7 +38,7 @@ extern "C" {
 #define GetCyanPixelComponent(pixel) ((pixel)->red)
 #define GetGrayPixelComponent(pixel) ((pixel)->red)
 #define GetGreenPixelComponent(pixel) ((pixel)->green)
-#define GetIndexPixelComponent(pixel) ((pixel)->index)
+#define GetIndexPixelComponent(indexes) (*(indexes))
 #define GetMagentaPixelComponent(pixel) ((pixel)->green)
 #define GetNextPixel(pixel)  ((pixel)+1)
 #define GetOpacityPixelComponent(pixel) ((pixel)->opacity)
@@ -47,20 +47,21 @@ extern "C" {
 #define GetYellowPixelComponent(pixel) ((pixel)->blue)
 #define SetAlphaPixelComponent(pixel,value) \
   ((pixel)->opacity=(Quantum) (QuantumRange-(value)))
-#define SetBlackPixelComponent(index,value) (*(index)=(value))
-#define SetBluePixelComponent(pixel,value) ((pixel)->blue=(value))
-#define SetCbPixelComponent(pixel,value) ((pixel)->green=(value))
-#define SetCrPixelComponent(pixel,value) ((pixel)->blue=(value))
-#define SetCyanPixelComponent(pixel,value) ((pixel)->red=(value))
+#define SetBlackPixelComponent(index,value) (*(index)=(Quantum) (value))
+#define SetBluePixelComponent(pixel,value) ((pixel)->blue=(Quantum) (value))
+#define SetCbPixelComponent(pixel,value) ((pixel)->green=(Quantum) (value))
+#define SetCrPixelComponent(pixel,value) ((pixel)->blue=(Quantum) (value))
+#define SetCyanPixelComponent(pixel,value) ((pixel)->red=(Quantum) (value))
 #define SetGrayPixelComponent(pixel,value) \
-  ((pixel)->red=(pixel)->green=(pixel)->blue=(value))
-#define SetGreenPixelComponent(pixel,value) ((pixel)->green=(value))
-#define SetIndexPixelComponent(pixel,value) ((pixel)->index=(value))
-#define SetMagentaPixelComponent(pixel,value) ((pixel)->green=(value))
-#define SetOpacityPixelComponent(pixel,value) ((pixel)->opacity=(value))
-#define SetRedPixelComponent(pixel,value) ((pixel)->red=(value))
-#define SetYellowPixelComponent(pixel,value) ((pixel)->blue=(value))
-#define SetYPixelComponent(pixel,value) ((pixel)->red=(value))
+  ((pixel)->red=(pixel)->green=(pixel)->blue=(Quantum) (value))
+#define SetGreenPixelComponent(pixel,value) ((pixel)->green=(Quantum) (value))
+#define SetIndexPixelComponent(indexes,value) (*(indexes)=(IndexPacket) (value))
+#define SetMagentaPixelComponent(pixel,value) ((pixel)->green=(Quantum) (value))
+#define SetOpacityPixelComponent(pixel,value) \
+  ((pixel)->opacity=(Quantum) (value))
+#define SetRedPixelComponent(pixel,value) ((pixel)->red=(Quantum) (value))
+#define SetYellowPixelComponent(pixel,value) ((pixel)->blue=(Quantum) (value))
+#define SetYPixelComponent(pixel,value) ((pixel)->red=(Quantum) (value))
 
 typedef enum
 {