From 0b2eadc3a8b3064573eb5389f2925cca7820fb28 Mon Sep 17 00:00:00 2001 From: dirk Date: Fri, 4 Apr 2014 20:57:30 +0000 Subject: [PATCH] Build fix. --- coders/screenshot.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/coders/screenshot.c b/coders/screenshot.c index caebc00b7..1f66a6f81 100644 --- a/coders/screenshot.c +++ b/coders/screenshot.c @@ -45,7 +45,7 @@ # include # else /* All MinGW needs ... */ -# include "magick/nt-base-private.h" +# include "MagickCore/nt-base-private.h" # include # endif #endif @@ -131,7 +131,7 @@ static Image *ReadSCREENSHOTImage(const ImageInfo *image_info, int i; - register PixelPacket + register Quantum *q; register ssize_t @@ -156,7 +156,7 @@ static Image *ReadSCREENSHOTImage(const ImageInfo *image_info, if (hDC == (HDC) NULL) ThrowReaderException(CoderError,"UnableToCreateDC"); - screen=AcquireImage(image_info); + screen=AcquireImage(image_info,exception); screen->columns=(size_t) GetDeviceCaps(hDC,HORZRES); screen->rows=(size_t) GetDeviceCaps(hDC,VERTRES); screen->storage_class=DirectClass; @@ -201,14 +201,14 @@ static Image *ReadSCREENSHOTImage(const ImageInfo *image_info, for (y=0; y < (ssize_t) screen->rows; y++) { q=QueueAuthenticPixels(screen,0,y,screen->columns,1,exception); - if (q == (PixelPacket *) NULL) + if (q == (Quantum *) NULL) break; for (x=0; x < (ssize_t) screen->columns; x++) { - SetPixelRed(q,ScaleCharToQuantum(p->rgbtRed)); - SetPixelGreen(q,ScaleCharToQuantum(p->rgbtGreen)); - SetPixelBlue(q,ScaleCharToQuantum(p->rgbtBlue)); - SetPixelOpacity(q,OpaqueOpacity); + SetPixelRed(image,ScaleCharToQuantum(p->rgbtRed),q); + SetPixelGreen(image,ScaleCharToQuantum(p->rgbtGreen),q); + SetPixelBlue(image,ScaleCharToQuantum(p->rgbtBlue),q); + SetPixelAlpha(image,OpaqueAlpha,q); p++; q++; } -- 2.40.0