]> granicus.if.org Git - imagemagick/commitdiff
(no commit message)
authorcristy <urban-warrior@git.imagemagick.org>
Thu, 22 Nov 2012 02:25:54 +0000 (02:25 +0000)
committercristy <urban-warrior@git.imagemagick.org>
Thu, 22 Nov 2012 02:25:54 +0000 (02:25 +0000)
coders/bmp.c

index c9c3378c09cbe2ead479616e633b7946a0fcd2e2..d33d7b4c3aa7002317445ca1daa2d7662d40d195 100644 (file)
@@ -730,18 +730,24 @@ static Image *ReadBMPImage(const ImageInfo *image_info,ExceptionInfo *exception)
             bmp_info.blue_primary.x=(double) ReadBlobLSBLong(image)/0x40000000;
             bmp_info.blue_primary.y=(double) ReadBlobLSBLong(image)/0x40000000;
             bmp_info.blue_primary.z=(double) ReadBlobLSBLong(image)/0x40000000;
-            sum=bmp_info.red_primary.x+bmp_info.red_primary.y+
+            sum=bmp_info.red_primary.x+bmp_info.red_primary.x+
               bmp_info.red_primary.z;
-            image->chromaticity.red_primary.x/=sum;
-            image->chromaticity.red_primary.y/=sum;
-            sum=bmp_info.green_primary.x+bmp_info.green_primary.y+
+            bmp_info.red_primary.x/=sum;
+            bmp_info.red_primary.y/=sum;
+            image->chromaticity.red_primary.x=bmp_info.red_primary.x;
+            image->chromaticity.red_primary.y=bmp_info.red_primary.y;
+            sum=bmp_info.green_primary.x+bmp_info.green_primary.x+
               bmp_info.green_primary.z;
-            image->chromaticity.green_primary.x/=sum;
-            image->chromaticity.green_primary.y/=sum;
-            sum=bmp_info.blue_primary.x+bmp_info.blue_primary.y+
+            bmp_info.green_primary.x/=sum;
+            bmp_info.green_primary.y/=sum;
+            image->chromaticity.green_primary.x=bmp_info.green_primary.x;
+            image->chromaticity.green_primary.y=bmp_info.green_primary.y;
+            sum=bmp_info.blue_primary.x+bmp_info.blue_primary.x+
               bmp_info.blue_primary.z;
-            image->chromaticity.blue_primary.x/=sum;
-            image->chromaticity.blue_primary.y/=sum;
+            bmp_info.blue_primary.x/=sum;
+            bmp_info.blue_primary.y/=sum;
+            image->chromaticity.blue_primary.x=bmp_info.blue_primary.x;
+            image->chromaticity.blue_primary.y=bmp_info.blue_primary.y;
             /*
               Decode 16^16 fixed point formatted gamma_scales.
             */