From 8314a30f02031c5890c0fa409cc5109a36db47eb Mon Sep 17 00:00:00 2001 From: cristy Date: Mon, 8 Dec 2014 16:05:32 +0000 Subject: [PATCH] --- coders/bmp.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/coders/bmp.c b/coders/bmp.c index 4b7afff75..7bfd065b8 100644 --- a/coders/bmp.c +++ b/coders/bmp.c @@ -1059,8 +1059,8 @@ static Image *ReadBMPImage(const ImageInfo *image_info,ExceptionInfo *exception) break; if (image->previous == (Image *) NULL) { - status=SetImageProgress(image,LoadImageTag,(MagickOffsetType) y, - image->rows); + status=SetImageProgress(image,LoadImageTag,(MagickOffsetType) + (image->rows-y),image->rows); if (status == MagickFalse) break; } @@ -1100,8 +1100,8 @@ static Image *ReadBMPImage(const ImageInfo *image_info,ExceptionInfo *exception) break; if (image->previous == (Image *) NULL) { - status=SetImageProgress(image,LoadImageTag,(MagickOffsetType) y, - image->rows); + status=SetImageProgress(image,LoadImageTag,(MagickOffsetType) + (image->rows-y),image->rows); if (status == MagickFalse) break; } @@ -1134,8 +1134,8 @@ static Image *ReadBMPImage(const ImageInfo *image_info,ExceptionInfo *exception) offset=(MagickOffsetType) (image->rows-y-1); if (image->previous == (Image *) NULL) { - status=SetImageProgress(image,LoadImageTag,(MagickOffsetType) y, - image->rows); + status=SetImageProgress(image,LoadImageTag,(MagickOffsetType) + (image->rows-y),image->rows); if (status == MagickFalse) break; } @@ -1195,8 +1195,8 @@ static Image *ReadBMPImage(const ImageInfo *image_info,ExceptionInfo *exception) SetPixelBlue(image,ScaleShortToQuantum((unsigned short) blue),q); SetPixelAlpha(image,OpaqueAlpha,q); if (image->alpha_trait == BlendPixelTrait) - SetPixelAlpha(image,ScaleShortToQuantum((unsigned short) - opacity),q); + SetPixelAlpha(image,ScaleShortToQuantum((unsigned short) opacity), + q); q+=GetPixelChannels(image); } if (SyncAuthenticPixels(image,exception) == MagickFalse) @@ -1204,8 +1204,8 @@ static Image *ReadBMPImage(const ImageInfo *image_info,ExceptionInfo *exception) offset=(MagickOffsetType) (image->rows-y-1); if (image->previous == (Image *) NULL) { - status=SetImageProgress(image,LoadImageTag,(MagickOffsetType) y, - image->rows); + status=SetImageProgress(image,LoadImageTag,(MagickOffsetType) + (image->rows-y),image->rows); if (status == MagickFalse) break; } @@ -1237,8 +1237,8 @@ static Image *ReadBMPImage(const ImageInfo *image_info,ExceptionInfo *exception) offset=(MagickOffsetType) (image->rows-y-1); if (image->previous == (Image *) NULL) { - status=SetImageProgress(image,LoadImageTag,(MagickOffsetType) y, - image->rows); + status=SetImageProgress(image,LoadImageTag,(MagickOffsetType) + (image->rows-y),image->rows); if (status == MagickFalse) break; } @@ -1299,8 +1299,8 @@ static Image *ReadBMPImage(const ImageInfo *image_info,ExceptionInfo *exception) offset=(MagickOffsetType) (image->rows-y-1); if (image->previous == (Image *) NULL) { - status=SetImageProgress(image,LoadImageTag,(MagickOffsetType) y, - image->rows); + status=SetImageProgress(image,LoadImageTag,(MagickOffsetType) + (image->rows-y),image->rows); if (status == MagickFalse) break; } -- 2.40.0