From ccf844f01bcfb63e8c6260bc986878089bb4c85b Mon Sep 17 00:00:00 2001 From: cristy Date: Wed, 3 Feb 2010 23:28:16 +0000 Subject: [PATCH] --- magick/xwindow.c | 63 +++++++++++++++++++++++++++--------------------- 1 file changed, 36 insertions(+), 27 deletions(-) diff --git a/magick/xwindow.c b/magick/xwindow.c index 3cd7b8725..a5076f75b 100644 --- a/magick/xwindow.c +++ b/magick/xwindow.c @@ -707,7 +707,6 @@ MagickExport MagickBooleanType XAnnotateImage(Display *display, % % o text_font: True is font should be mono-spaced (typewriter style). % -% */ static char **FontToList(char *font) @@ -2108,7 +2107,6 @@ MagickExport void XDisplayImageInfo(Display *display, % o ximage: Specifies a pointer to a XImage structure; returned from % XCreateImage. % -% */ static void XDitherImage(Image *image,XImage *ximage) { @@ -3744,7 +3742,6 @@ MagickExport char *XGetScreenDensity(Display *display) % o y: the y coordinate of the pointer relative to the origin of the % window. % -% */ static Window XGetSubwindow(Display *display,Window window,int x,int y) { @@ -3937,7 +3934,6 @@ MagickExport MagickBooleanType XGetWindowColor(Display *display, % one call. A value of one causes the function to descend the window % hierarchy and overlay the target image with each subwindow image. % -% */ static Image *XGetWindowImage(Display *display,const Window window, const unsigned int borders,const unsigned int level) @@ -6240,9 +6236,12 @@ static void XMakeImageLSBFirst(const XResourceInfo *resource_info, */ for (x=(int) canvas->columns-1; x >= 0; x--) { - *q++=ScaleQuantumToChar(XBlueGamma(GetBluePixelComponent(p))); - *q++=ScaleQuantumToChar(XGreenGamma(GetGreenPixelComponent(p))); - *q++=ScaleQuantumToChar(XRedGamma(GetRedPixelComponent(p))); + *q++=ScaleQuantumToChar(XBlueGamma( + GetBluePixelComponent(p))); + *q++=ScaleQuantumToChar(XGreenGamma( + GetGreenPixelComponent(p))); + *q++=ScaleQuantumToChar(XRedGamma( + GetRedPixelComponent(p))); *q++=0; p++; } @@ -6281,9 +6280,12 @@ static void XMakeImageLSBFirst(const XResourceInfo *resource_info, */ for (x=(int) canvas->columns-1; x >= 0; x--) { - *q++=ScaleQuantumToChar(XRedGamma(GetRedPixelComponent(p))); - *q++=ScaleQuantumToChar(XGreenGamma(GetGreenPixelComponent(p))); - *q++=ScaleQuantumToChar(XBlueGamma(GetBluePixelComponent(p))); + *q++=ScaleQuantumToChar(XRedGamma( + GetRedPixelComponent(p))); + *q++=ScaleQuantumToChar(XGreenGamma( + GetGreenPixelComponent(p))); + *q++=ScaleQuantumToChar(XBlueGamma( + GetBluePixelComponent(p))); *q++=0; p++; } @@ -6291,9 +6293,12 @@ static void XMakeImageLSBFirst(const XResourceInfo *resource_info, } for (x=(int) canvas->columns-1; x >= 0; x--) { - *q++=ScaleQuantumToChar((Quantum) GetRedPixelComponent(p)); - *q++=ScaleQuantumToChar((Quantum) GetGreenPixelComponent(p)); - *q++=ScaleQuantumToChar((Quantum) GetBluePixelComponent(p)); + *q++=ScaleQuantumToChar((Quantum) + GetRedPixelComponent(p)); + *q++=ScaleQuantumToChar((Quantum) + GetGreenPixelComponent(p)); + *q++=ScaleQuantumToChar((Quantum) + GetBluePixelComponent(p)); *q++=0; p++; } @@ -6411,7 +6416,6 @@ static void XMakeImageLSBFirst(const XResourceInfo *resource_info, % o matte_image: Specifies a pointer to a XImage structure; returned from % XCreateImage. % -% */ static void XMakeImageMSBFirst(const XResourceInfo *resource_info, const XWindowInfo *window,Image *image,XImage *ximage,XImage *matte_image) @@ -6845,9 +6849,12 @@ static void XMakeImageMSBFirst(const XResourceInfo *resource_info, for (x=(int) canvas->columns-1; x >= 0; x--) { *q++=0; - *q++=ScaleQuantumToChar(XRedGamma(GetRedPixelComponent(p))); - *q++=ScaleQuantumToChar(XGreenGamma(GetGreenPixelComponent(p))); - *q++=ScaleQuantumToChar(XBlueGamma(GetBluePixelComponent(p))); + *q++=ScaleQuantumToChar(XRedGamma( + GetRedPixelComponent(p))); + *q++=ScaleQuantumToChar(XGreenGamma( + GetGreenPixelComponent(p))); + *q++=ScaleQuantumToChar(XBlueGamma( + GetBluePixelComponent(p))); p++; } continue; @@ -6886,9 +6893,12 @@ static void XMakeImageMSBFirst(const XResourceInfo *resource_info, for (x=(int) canvas->columns-1; x >= 0; x--) { *q++=0; - *q++=ScaleQuantumToChar(XBlueGamma(GetBluePixelComponent(p))); - *q++=ScaleQuantumToChar(XGreenGamma(GetGreenPixelComponent(p))); - *q++=ScaleQuantumToChar(XRedGamma(GetRedPixelComponent(p))); + *q++=ScaleQuantumToChar(XBlueGamma( + GetBluePixelComponent(p))); + *q++=ScaleQuantumToChar(XGreenGamma( + GetGreenPixelComponent(p))); + *q++=ScaleQuantumToChar(XRedGamma( + GetRedPixelComponent(p))); p++; } continue; @@ -6896,9 +6906,12 @@ static void XMakeImageMSBFirst(const XResourceInfo *resource_info, for (x=(int) canvas->columns-1; x >= 0; x--) { *q++=0; - *q++=ScaleQuantumToChar((Quantum) GetBluePixelComponent(p)); - *q++=ScaleQuantumToChar((Quantum) GetGreenPixelComponent(p)); - *q++=ScaleQuantumToChar((Quantum) GetRedPixelComponent(p)); + *q++=ScaleQuantumToChar((Quantum) + GetBluePixelComponent(p)); + *q++=ScaleQuantumToChar((Quantum) + GetGreenPixelComponent(p)); + *q++=ScaleQuantumToChar((Quantum) + GetRedPixelComponent(p)); p++; } } @@ -7469,7 +7482,6 @@ MagickExport void XMakeMagnifyImage(Display *display,XWindows *windows) % % o window: Specifies a pointer to a XWindowInfo structure. % -% */ static MagickBooleanType XMakePixmap(Display *display, const XResourceInfo *resource_info,XWindowInfo *window) @@ -7572,7 +7584,6 @@ static MagickBooleanType XMakePixmap(Display *display, % % o pixel: Specifies a pointer to a XPixelInfo structure. % -% */ #if defined(__cplusplus) || defined(c_plusplus) @@ -8935,7 +8946,6 @@ MagickExport void XRetainWindowColors(Display *display,const Window window) % o crop_info: Specifies a pointer to a RectangleInfo structure. It % contains the extents of any cropping rectangle. % -% */ static Window XSelectWindow(Display *display,RectangleInfo *crop_info) { @@ -9289,7 +9299,6 @@ MagickExport void XUserPreferences(XResourceInfo *resource_info) % % o class: Specifies the visual class. % -% */ static const char *XVisualClassName(const int visual_class) { -- 2.40.0