From 899d7506d6782201cd09bcd564a02197c28d4f73 Mon Sep 17 00:00:00 2001 From: Cristy Date: Wed, 10 Apr 2019 21:07:05 -0400 Subject: [PATCH] ... --- MagickCore/animate.c | 14 +++--- MagickCore/display.c | 88 ++++++++++++++++++------------------- MagickCore/widget-private.h | 8 ++-- MagickCore/widget.c | 21 ++++----- configure | 2 +- 5 files changed, 67 insertions(+), 66 deletions(-) diff --git a/MagickCore/animate.c b/MagickCore/animate.c index e79715c03..da441aad3 100644 --- a/MagickCore/animate.c +++ b/MagickCore/animate.c @@ -91,7 +91,7 @@ Static declarations. */ static const char - *AnimateHelp[]= + *const AnimateHelp[] = { "BUTTONS", "", @@ -162,7 +162,7 @@ static const char Constant declarations. */ static const char - *PageSizes[]= + *const PageSizes[] = { "Letter", "Tabloid", @@ -1215,7 +1215,7 @@ MagickExport Image *XAnimateImages(Display *display, #define MagickTitle "Commands" static const char - *CommandMenu[]= + *const CommandMenu[]= { "Animate", "Speed", @@ -1225,7 +1225,7 @@ MagickExport Image *XAnimateImages(Display *display, "Quit", (char *) NULL }, - *AnimateMenu[]= + *const AnimateMenu[]= { "Open...", "Play", @@ -1235,19 +1235,19 @@ MagickExport Image *XAnimateImages(Display *display, "Save...", (char *) NULL }, - *SpeedMenu[]= + *const SpeedMenu[]= { "Faster", "Slower", (char *) NULL }, - *DirectionMenu[]= + *const DirectionMenu[]= { "Forward", "Reverse", (char *) NULL }, - *HelpMenu[]= + *const HelpMenu[]= { "Overview", "Browse Documentation", diff --git a/MagickCore/display.c b/MagickCore/display.c index 457490424..4e8e7eb15 100644 --- a/MagickCore/display.c +++ b/MagickCore/display.c @@ -122,7 +122,7 @@ static const unsigned char }; static const char - *PageSizes[] = + *const PageSizes[] = { "Letter", "Tabloid", @@ -145,7 +145,7 @@ static const char Help widget declarations. */ static const char - *ImageAnnotateHelp[] = + *const ImageAnnotateHelp[] = { "In annotate mode, the Command widget has these options:", "", @@ -242,7 +242,7 @@ static const char "PseudoClass image to remain PseudoClass, use -colors.", (char *) NULL, }, - *ImageChopHelp[] = + *const ImageChopHelp[] = { "In chop mode, the Command widget has these options:", "", @@ -270,7 +270,7 @@ static const char "starting point of the line and release the button.", (char *) NULL, }, - *ImageColorEditHelp[] = + *const ImageColorEditHelp[] = { "In color edit mode, the Command widget has these options:", "", @@ -346,7 +346,7 @@ static const char "PseudoClass image to remain PseudoClass, use -colors.", (char *) NULL, }, - *ImageCompositeHelp[] = + *const ImageCompositeHelp[] = { "First a widget window is displayed requesting you to enter an", "image name. Press Composite, Grab or type a file name.", @@ -510,7 +510,7 @@ static const char "to remain PseudoClass, use -colors.", (char *) NULL, }, - *ImageCutHelp[] = + *const ImageCutHelp[] = { "In cut mode, the Command widget has these options:", "", @@ -534,7 +534,7 @@ static const char "exit without cutting the image, press Dismiss.", (char *) NULL, }, - *ImageCopyHelp[] = + *const ImageCopyHelp[] = { "In copy mode, the Command widget has these options:", "", @@ -558,7 +558,7 @@ static const char "exit without copying the image, press Dismiss.", (char *) NULL, }, - *ImageCropHelp[] = + *const ImageCropHelp[] = { "In crop mode, the Command widget has these options:", "", @@ -582,7 +582,7 @@ static const char "exit without cropping the image, press Dismiss.", (char *) NULL, }, - *ImageDrawHelp[] = + *const ImageDrawHelp[] = { "The cursor changes to a crosshair to indicate you are in", "draw mode. To exit immediately, press Dismiss. In draw mode,", @@ -662,7 +662,7 @@ static const char "starting point of the line and release the button.", (char *) NULL, }, - *DisplayHelp[] = + *const DisplayHelp[] = { "BUTTONS", " The effects of each button press is described below. Three", @@ -991,7 +991,7 @@ static const char " from any side of the image.", (char *) NULL, }, - *ImageMatteEditHelp[] = + *const ImageMatteEditHelp[] = { "Matte information within an image is useful for some", "operations such as image compositing (See IMAGE", @@ -1070,7 +1070,7 @@ static const char "DirectColor visual or a Standard Colormap.", (char *) NULL, }, - *ImagePanHelp[] = + *const ImagePanHelp[] = { "When an image exceeds the width or height of the X server", "screen, display maps a small panning icon. The rectangle", @@ -1089,7 +1089,7 @@ static const char "than the dimensions of the X server screen.", (char *) NULL, }, - *ImagePasteHelp[] = + *const ImagePasteHelp[] = { "A small window appears showing the location of the cursor in", "the image window. You are now in paste mode. To exit", @@ -1211,7 +1211,7 @@ static const char "to remain PseudoClass, use -colors.", (char *) NULL, }, - *ImageROIHelp[] = + *const ImageROIHelp[] = { "In region of interest mode, the Command widget has these", "options:", @@ -1292,7 +1292,7 @@ static const char "Dismiss.", (char *) NULL, }, - *ImageRotateHelp[] = + *const ImageRotateHelp[] = { "In rotate mode, the Command widget has these options:", "", @@ -2095,7 +2095,7 @@ static MagickBooleanType XAnnotateEditImage(Display *display, angle[MagickPathExtent] = "30.0"; static const char - *RotateMenu[] = + *const RotateMenu[] = { "-90", "-45", @@ -2860,7 +2860,7 @@ static MagickBooleanType XChopImage(Display *display, ExceptionInfo *exception) { static const char - *ChopMenu[] = + *const ChopMenu[] = { "Direction", "Help", @@ -2963,7 +2963,7 @@ static MagickBooleanType XChopImage(Display *display, command[MagickPathExtent]; static const char - *Directions[] = + *const Directions[] = { "horizontal", "vertical", @@ -3285,7 +3285,7 @@ static MagickBooleanType XColorEditImage(Display *display, ExceptionInfo *exception) { static const char - *ColorEditMenu[] = + *const ColorEditMenu[] = { "Method", "Pixel Color", @@ -3515,7 +3515,7 @@ static MagickBooleanType XColorEditImage(Display *display, fuzz[MagickPathExtent]; static const char - *FuzzMenu[] = + *const FuzzMenu[] = { "0%", "2%", @@ -3912,7 +3912,7 @@ static MagickBooleanType XCompositeImage(Display *display, filename[MagickPathExtent] = "\0"; static const char - *CompositeMenu[] = + *const CompositeMenu[] = { "Operators", "Dissolve", @@ -4573,7 +4573,7 @@ static MagickBooleanType XCropImage(Display *display, const ClipboardMode mode,ExceptionInfo *exception) { static const char - *CropModeMenu[] = + *const CropModeMenu[] = { "Help", "Dismiss", @@ -5409,7 +5409,7 @@ static MagickBooleanType XDrawEditImage(Display *display, ExceptionInfo *exception) { static const char - *DrawMenu[] = + *const DrawMenu[] = { "Element", "Color", @@ -5556,7 +5556,7 @@ static MagickBooleanType XDrawEditImage(Display *display, case DrawElementCommand: { static const char - *Elements[] = + *const Elements[] = { "point", "line", @@ -5765,7 +5765,7 @@ static MagickBooleanType XDrawEditImage(Display *display, width[MagickPathExtent] = "0"; static const char - *WidthsMenu[] = + *const WidthsMenu[] = { "1", "2", @@ -9667,7 +9667,7 @@ static MagickBooleanType XMatteEditImage(Display *display, matte[MagickPathExtent] = "0"; static const char - *MatteEditMenu[] = + *const MatteEditMenu[] = { "Method", "Border Color", @@ -9845,7 +9845,7 @@ static MagickBooleanType XMatteEditImage(Display *display, fuzz[MagickPathExtent]; static const char - *FuzzMenu[] = + *const FuzzMenu[] = { "0%", "2%", @@ -9885,7 +9885,7 @@ static MagickBooleanType XMatteEditImage(Display *display, message[MagickPathExtent]; static const char - *MatteMenu[] = + *const MatteMenu[] = { "Opaque", "Transparent", @@ -10614,7 +10614,7 @@ static MagickBooleanType XPasteImage(Display *display, ExceptionInfo *exception) { static const char - *PasteMenu[] = + *const PasteMenu[] = { "Operator", "Help", @@ -11076,13 +11076,13 @@ static MagickBooleanType XROIImage(Display *display, #define ApplyMenus 7 static const char - *ROIMenu[] = + *const ROIMenu[] = { "Help", "Dismiss", (char *) NULL }, - *ApplyMenu[] = + *const ApplyMenu[] = { "File", "Edit", @@ -11095,19 +11095,19 @@ static MagickBooleanType XROIImage(Display *display, "Dismiss", (char *) NULL }, - *FileMenu[] = + *const FileMenu[] = { "Save...", "Print...", (char *) NULL }, - *EditMenu[] = + *const EditMenu[] = { "Undo", "Redo", (char *) NULL }, - *TransformMenu[] = + *const TransformMenu[] = { "Flop", "Flip", @@ -11115,7 +11115,7 @@ static MagickBooleanType XROIImage(Display *display, "Rotate Left", (char *) NULL }, - *EnhanceMenu[] = + *const EnhanceMenu[] = { "Hue...", "Saturation...", @@ -11133,7 +11133,7 @@ static MagickBooleanType XROIImage(Display *display, "Quantize...", (char *) NULL }, - *EffectsMenu[] = + *const EffectsMenu[] = { "Despeckle", "Emboss", @@ -11149,7 +11149,7 @@ static MagickBooleanType XROIImage(Display *display, "Segment...", (char *) NULL }, - *FXMenu[] = + *const FXMenu[] = { "Solarize...", "Sepia Tone...", @@ -11161,7 +11161,7 @@ static MagickBooleanType XROIImage(Display *display, "Charcoal Draw...", (char *) NULL }, - *MiscellanyMenu[] = + *const MiscellanyMenu[] = { "Image Info", "Zoom Image", @@ -11172,7 +11172,7 @@ static MagickBooleanType XROIImage(Display *display, }; static const char - **Menus[ApplyMenus] = + *const *Menus[ApplyMenus] = { FileMenu, EditMenu, @@ -12027,7 +12027,7 @@ static MagickBooleanType XRotateImage(Display *display, ExceptionInfo *exception) { static const char - *RotateMenu[] = + *const RotateMenu[] = { "Pixel Color", "Direction", @@ -12186,7 +12186,7 @@ static MagickBooleanType XRotateImage(Display *display, case RotateDirectionCommand: { static const char - *Directions[] = + *const Directions[] = { "horizontal", "vertical", @@ -13066,7 +13066,7 @@ static Image *XTileImage(Display *display,XResourceInfo *resource_info, XWindows *windows,Image *image,XEvent *event,ExceptionInfo *exception) { static const char - *VerbMenu[] = + *const VerbMenu[] = { "Load", "Next", @@ -14087,7 +14087,7 @@ MagickExport Image *XDisplayImage(Display *display,XResourceInfo *resource_info, #define MagickTitle "Commands" static const char - *CommandMenu[] = + *const CommandMenu[] = { "File", "Edit", @@ -15306,7 +15306,7 @@ MagickExport Image *XDisplayImage(Display *display,XResourceInfo *resource_info, factor; static const char - *MagnifyMenu[] = + *const MagnifyMenu[] = { "2", "4", diff --git a/MagickCore/widget-private.h b/MagickCore/widget-private.h index 148863fb6..0ef1d2cee 100644 --- a/MagickCore/widget-private.h +++ b/MagickCore/widget-private.h @@ -26,10 +26,10 @@ extern "C" { #if defined(MAGICKCORE_X11_DELEGATE) extern MagickPrivate int - XCommandWidget(Display *,XWindows *,const char **,XEvent *), + XCommandWidget(Display *,XWindows *,const char *const *,XEvent *), XConfirmWidget(Display *,XWindows *,const char *,const char *), XDialogWidget(Display *,XWindows *,const char *,const char *,char *), - XMenuWidget(Display *,XWindows *,const char *,const char **,char *); + XMenuWidget(Display *,XWindows *,const char *,const char *const *,char *); extern MagickPrivate MagickBooleanType XPreferencesWidget(Display *,XResourceInfo *,XWindows *); @@ -40,13 +40,13 @@ extern MagickPrivate void XFileBrowserWidget(Display *,XWindows *,const char *,char *), XFontBrowserWidget(Display *,XWindows *,const char *,char *), XInfoWidget(Display *,XWindows *,const char *), - XListBrowserWidget(Display *,XWindows *,XWindowInfo *,const char **, + XListBrowserWidget(Display *,XWindows *,XWindowInfo *,const char *const *, const char *,const char *,char *), XNoticeWidget(Display *,XWindows *,const char *,const char *), XProgressMonitorWidget(Display *,XWindows *,const char *, const MagickOffsetType,const MagickSizeType), XTextViewWidget(Display *,const XResourceInfo *,XWindows *, - const MagickBooleanType,const char *,const char **); + const MagickBooleanType,const char *,const char *const *); #endif diff --git a/MagickCore/widget.c b/MagickCore/widget.c index c492d9c19..346e4274d 100644 --- a/MagickCore/widget.c +++ b/MagickCore/widget.c @@ -1369,7 +1369,8 @@ static int XScreenEvent(Display *display,XEvent *event,char *data) if (event->xexpose.window == windows->command.id) if (event->xexpose.count == 0) { - (void) XCommandWidget(display,windows,(const char **) NULL,event); + (void) XCommandWidget(display,windows,(const char *const *) NULL, + event); break; } break; @@ -2778,7 +2779,7 @@ MagickPrivate void XColorBrowserWidget(Display *display,XWindows *windows, % The format of the XCommandWidget method is: % % int XCommandWidget(Display *display,XWindows *windows, -% const char **selections,XEvent *event) +% const char *const *selections,XEvent *event) % % A description of each parameter follows: % @@ -2797,7 +2798,7 @@ MagickPrivate void XColorBrowserWidget(Display *display,XWindows *windows, % */ MagickPrivate int XCommandWidget(Display *display,XWindows *windows, - const char **selections,XEvent *event) + const char *const *selections,XEvent *event) { #define tile_width 112 #define tile_height 70 @@ -6725,7 +6726,7 @@ MagickPrivate void XInfoWidget(Display *display,XWindows *windows, % The format of the XListBrowserWidget method is: % % void XListBrowserWidget(Display *display,XWindows *windows, -% XWindowInfo *window_info,const char **list,const char *action, +% XWindowInfo *window_info,const char *const *list,const char *action, % const char *query,char *reply) % % A description of each parameter follows: @@ -6746,7 +6747,7 @@ MagickPrivate void XInfoWidget(Display *display,XWindows *windows, % */ MagickPrivate void XListBrowserWidget(Display *display,XWindows *windows, - XWindowInfo *window_info,const char **list,const char *action, + XWindowInfo *window_info,const char *const *list,const char *action, const char *query,char *reply) { #define CancelButtonText "Cancel" @@ -7636,7 +7637,7 @@ MagickPrivate void XListBrowserWidget(Display *display,XWindows *windows, % The format of the XMenuWidget method is: % % int XMenuWidget(Display *display,XWindows *windows,const char *title, -% const char **selections,char *item) +% const char *const *selections,char *item) % % A description of each parameter follows: % @@ -7658,7 +7659,7 @@ MagickPrivate void XListBrowserWidget(Display *display,XWindows *windows, % */ MagickPrivate int XMenuWidget(Display *display,XWindows *windows, - const char *title,const char **selections,char *item) + const char *title,const char *const *selections,char *item) { Cursor cursor; @@ -8895,7 +8896,7 @@ MagickPrivate void XProgressMonitorWidget(Display *display,XWindows *windows, Update image windows if there is a pending expose event. */ while (XCheckTypedWindowEvent(display,windows->command.id,Expose,&event)) - (void) XCommandWidget(display,windows,(const char **) NULL,&event); + (void) XCommandWidget(display,windows,(const char *const *) NULL,&event); while (XCheckTypedWindowEvent(display,windows->image.id,Expose,&event)) XRefreshWindow(display,&windows->image,&event); while (XCheckTypedWindowEvent(display,windows->info.id,Expose,&event)) @@ -8936,7 +8937,7 @@ MagickPrivate void XProgressMonitorWidget(Display *display,XWindows *windows, % % void XTextViewWidget(Display *display,const XResourceInfo *resource_info, % XWindows *windows,const MagickBooleanType mono,const char *title, -% const char **textlist) +% const char *const *textlist) % % A description of each parameter follows: % @@ -8957,7 +8958,7 @@ MagickPrivate void XProgressMonitorWidget(Display *display,XWindows *windows, */ MagickPrivate void XTextViewWidget(Display *display, const XResourceInfo *resource_info,XWindows *windows, - const MagickBooleanType mono,const char *title,const char **textlist) + const MagickBooleanType mono,const char *title,const char *const *textlist) { #define DismissButtonText "Dismiss" diff --git a/configure b/configure index e1232313b..7eaa6bb78 100755 --- a/configure +++ b/configure @@ -4570,7 +4570,7 @@ MAGICK_PATCHLEVEL_VERSION=40 MAGICK_VERSION=7.0.8-40 -MAGICK_GIT_REVISION=15490:ecfeac404:20190407 +MAGICK_GIT_REVISION=15498:e15db5cee:20190410 # Substitute library versioning -- 2.40.0