Remove MagickCore X11 compatibility methods
diff --git a/MagickCore/Makefile.am b/MagickCore/Makefile.am
index 7399a74..579e385 100644
--- a/MagickCore/Makefile.am
+++ b/MagickCore/Makefile.am
@@ -213,8 +213,6 @@
MagickCore/pixel-private.h \
MagickCore/policy.c \
MagickCore/policy.h \
- MagickCore/PreRvIcccm.c \
- MagickCore/PreRvIcccm.h \
MagickCore/prepress.c \
MagickCore/prepress.h \
MagickCore/property.c \
@@ -317,7 +315,6 @@
MAGICKCORE_INCLUDE_HDRS = \
MagickCore/MagickCore.h \
- MagickCore/PreRvIcccm.h \
MagickCore/accelerate.h \
MagickCore/animate.h \
MagickCore/annotate.h \
diff --git a/MagickCore/PreRvIcccm.c b/MagickCore/PreRvIcccm.c
deleted file mode 100644
index 6b9c870..0000000
--- a/MagickCore/PreRvIcccm.c
+++ /dev/null
@@ -1,347 +0,0 @@
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% %
-% IIIII CCCC CCCC CCCC M M %
-% I C C C MM MM %
-% I C C C M M M %
-% I C C C M M %
-% IIIII CCCC CCCC CCCC M M %
-% %
-% MagickCore X11 Compatibility Methods %
-% %
-% Software Design %
-% Cristy %
-% December 1994 %
-% %
-% %
-% Copyright 1999-2015 ImageMagick Studio LLC, a non-profit organization %
-% dedicated to making software imaging solutions freely available. %
-% %
-% You may not use this file except in compliance with the License. You may %
-% obtain a copy of the License at %
-% %
-% http://www.imagemagick.org/script/license.php %
-% %
-% Unless required by applicable law or agreed to in writing, software %
-% distributed under the License is distributed on an "AS IS" BASIS, %
-% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. %
-% See the License for the specific language governing permissions and %
-% limitations under the License. %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-%
-*/
-
-#include "MagickCore/studio.h"
-#if defined(MAGICKCORE_X11_DELEGATE)
-#include "MagickCore/xwindow-private.h"
-
-#if defined(PRE_R6_ICCCM)
-/*
- Compatibility methods for pre X11R6 ICCCM.
-*/
-Status XInitImage(XImage *ximage)
-{
- Display
- display;
-
- ScreenFormat
- screen_format;
-
- XImage
- *created_ximage,
- target_ximage;
-
- /*
- Initialize the X image.
- */
- screen_format.depth=ximage->depth;
- screen_format.bits_per_pixel=(int) ximage->bits_per_pixel;
- display.byte_order=ximage->byte_order;
- display.bitmap_unit=ximage->bitmap_unit;
- display.bitmap_bit_order=ximage->bitmap_bit_order;
- display.pixmap_format=(&screen_format);
- display.nformats=1;
- created_ximage=XCreateImage(&display,(Visual *) NULL,ximage->depth,
- ximage->format,ximage->xoffset,(char *) NULL,ximage->width,ximage->height,
- ximage->bitmap_pad,ximage->bytes_per_line);
- if (created_ximage == (XImage *) NULL)
- return(0);
- target_ximage=(*ximage);
- *ximage=(*created_ximage);
- created_ximage->data=(char *) NULL;
- XDestroyImage(created_ximage);
- ximage->red_mask=target_ximage.red_mask;
- ximage->green_mask=target_ximage.green_mask;
- ximage->blue_mask=target_ximage.blue_mask;
- return(1);
-}
-#endif
-
-#if defined(PRE_R5_ICCCM)
-/*
- Compatibility methods for pre X11R5 ICCCM.
-*/
-void XrmCombineDatabase(XrmDatabase source,XrmDatabase *target,
- Bool override)
-{
- XrmMergeDatabases(source,target);
-}
-
-Status XrmCombineFileDatabase(const char *filename,XrmDatabase *target,
- Bool override)
-{
- XrmDatabase
- *combined_database,
- source;
-
- source=XrmGetFileDatabase(filename);
- if (override == MagickFalse)
- XrmMergeDatabases(source,target);
- return(1);
-}
-
-XrmDatabase XrmGetDatabase(Display *display)
-{
- return(display->db);
-}
-
-char *XSetLocaleModifiers(char *modifiers)
-{
- return((char *) NULL);
-}
-
-Bool XSupportsLocale()
-{
- return(0);
-}
-#endif
-
-#if defined(PRE_R4_ICCCM)
-/*
- Compatibility methods for pre X11R4 ICCCM.
-*/
-XClassHint *XAllocClassHint)
-{
- return((XClassHint *) AcquireMagickMemory(sizeof(XClassHint)));
-}
-
-XIconSize *XAllocIconSize)
-{
- return((XIconSize *) AcquireMagickMemory(sizeof(XIconSize)));
-}
-
-XSizeHints *XAllocSizeHints)
-{
- return((XSizeHints *) AcquireMagickMemory(sizeof(XSizeHints)));
-}
-
-Status XReconfigureWMWindow(Display *display,Window window,int screen_number,
- unsigned int value_mask,XWindowChanges *values)
-{
- return(XConfigureWindow(display,window,value_mask,values));
-}
-
-XStandardColormap *XAllocStandardColormap)
-{
- return((XStandardColormap *) AcquireMagickMemory(sizeof(XStandardColormap)));
-}
-
-XWMHints *XAllocWMHints)
-{
- return((XWMHints *) AcquireMagickMemory(sizeof(XWMHints)));
-}
-
-Status XGetGCValues(Display *display,GC gc,size_t mask,
- XGCValues *values)
-{
- return(MagickTrue);
-}
-
-Status XGetRGBColormaps(Display *display,Window window,
- XStandardColormap **colormap,int *count,Atom property)
-{
- *count=1;
- return(XGetStandardColormap(display,window,*colormap,property));
-}
-
-Status XGetWMColormapWindows(Display *display,Window window,
- Window **colormap_windows,int *number_windows)
-{
- Atom
- actual_type,
- *data,
- property;
-
- int
- actual_format,
- status;
-
- size_t
- leftover,
- number_items;
-
- property=XInternAtom(display,"WM_COLORMAP_WINDOWS",MagickFalse);
- if (property == None)
- return(MagickFalse);
- /*
- Get the window property.
- */
- *data=(Atom) NULL;
- status=XGetWindowProperty(display,window,property,0L,1000000L,MagickFalse,
- XA_WINDOW,&actual_type,&actual_format,&number_items,&leftover,
- (unsigned char **) &data);
- if (status != Success)
- return(MagickFalse);
- if ((actual_type != XA_WINDOW) || (actual_format != 32))
- {
- if (data != (Atom *) NULL)
- XFree((char *) data);
- return(MagickFalse);
- }
- *colormap_windows=(Window *) data;
- *number_windows=(int) number_items;
- return(MagickTrue);
-}
-
-Status XGetWMName(Display *display,Window window,XTextProperty *text_property)
-{
- char
- *window_name;
-
- if (XFetchName(display,window,&window_name) == 0)
- return(MagickFalse);
- text_property->value=(unsigned char *) window_name;
- text_property->encoding=XA_STRING;
- text_property->format=8;
- text_property->nitems=strlen(window_name);
- return(MagickTrue);
-}
-
-char *XResourceManagerString(Display *display)
-{
- return(display->xdefaults);
-}
-
-void XrmDestroyDatabase(XrmDatabase database)
-{
-}
-
-void XSetWMIconName(Display *display,Window window,XTextProperty *property)
-{
- XSetIconName(display,window,property->value);
-}
-
-void XSetWMName(Display *display,Window window,XTextProperty *property)
-{
- XStoreName(display,window,property->value);
-}
-
-void XSetWMProperties(Display *display,Window window,
- XTextProperty *window_name,XTextProperty *icon_name,char **argv,
- int argc,XSizeHints *size_hints,XWMHints *manager_hints,
- XClassHint *class_hint)
-{
- XSetStandardProperties(display,window,window_name->value,icon_name->value,
- None,argv,argc,size_hints);
- XSetWMHints(display,window,manager_hints);
- XSetClassHint(display,window,class_hint);
-}
-
-Status XSetWMProtocols(Display *display,Window window,Atom *protocols,
- int count)
-{
- Atom
- wm_protocols;
-
- wm_protocols=XInternAtom(display,"WM_PROTOCOLS",MagickFalse);
- XChangeProperty(display,window,wm_protocols,XA_ATOM,32,PropModeReplace,
- (unsigned char *) protocols,count);
- return(MagickTrue);
-}
-
-int XStringListToTextProperty(char **argv,int argc,XTextProperty *property)
-{
- register int
- i;
-
- register unsigned int
- number_bytes;
-
- XTextProperty
- protocol;
-
- number_bytes=0;
- for (i=0; i < (ssize_t) argc; i++)
- number_bytes+=(unsigned int) ((argv[i] ? strlen(argv[i]) : 0)+1);
- protocol.encoding=XA_STRING;
- protocol.format=8;
- protocol.nitems=0;
- if (number_bytes)
- protocol.nitems=number_bytes-1;
- protocol.value=NULL;
- if (number_bytes <= 0)
- {
- protocol.value=(unsigned char *) AcquireQuantumMemory(1UL,
- sizeof(*protocol.value));
- if (protocol.value == MagickFalse)
- return(MagickFalse);
- *protocol.value='\0';
- }
- else
- {
- register char
- *buffer;
-
- buffer=(char *) AcquireQuantumMemory(number_bytes,sizeof(*buffer));
- if (buffer == (char *) NULL)
- return(MagickFalse);
- protocol.value=(unsigned char *) buffer;
- for (i=0; i < (ssize_t) argc; i++)
- {
- char
- *argument;
-
- argument=argv[i];
- if (argument == MagickFalse)
- *buffer++='\0';
- else
- {
- (void) CopyMagickString(buffer,argument,MagickPathExtent);
- buffer+=(strlen(argument)+1);
- }
- }
- }
- *property=protocol;
- return(MagickTrue);
-}
-
-VisualID XVisualIDFromVisual(Visual *visual)
-{
- return(visual->visualid);
-}
-
-Status XWithdrawWindow(Display *display,Window window,int screen)
-{
- return(XUnmapWindow(display,window));
-}
-
-int XWMGeometry(Display *display,int screen,char *user_geometry,
- char *default_geometry,unsigned int border_width,XSizeHints *size_hints,
- int *x,int *y,int *width,int *height,int *gravity)
-{
- int
- status;
-
- status=XGeometry(display,screen,user_geometry,default_geometry,border_width,
- 0,0,0,0,x,y,width,height);
- *gravity=NorthWestGravity;
- return(status);
-}
-#endif
-
-#endif
diff --git a/MagickCore/PreRvIcccm.h b/MagickCore/PreRvIcccm.h
deleted file mode 100644
index c091cb1..0000000
--- a/MagickCore/PreRvIcccm.h
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- Copyright 1999-2015 ImageMagick Studio LLC, a non-profit organization
- dedicated to making software imaging solutions freely available.
-
- You may not use this file except in compliance with the License.
- obtain a copy of the License at
-
- http://www.imagemagick.org/script/license.php
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- MagickCore X11 compatibility methods.
-*/
-#ifndef _MAGICKCORE_PRER5ICCCM_H
-#define _MAGICKCORE_PRER5ICCCM_H
-
-#if defined(__cplusplus) || defined(c_plusplus)
-extern "C" {
-#endif
-
-#if defined(PRE_R6_ICCCM)
-/*
- Compatability defines for pre X11R6 ICCCM.
-*/
-#define XK_KP_Home 0xFF95
-#define XK_KP_Left 0xFF96
-#define XK_KP_Up 0xFF97
-#define XK_KP_Right 0xFF98
-#define XK_KP_Down 0xFF99
-#define XK_KP_Prior 0xFF9A
-#define XK_KP_Page_Up 0xFF9A
-#define XK_KP_Next 0xFF9B
-#define XK_KP_Page_Down 0xFF9B
-#define XK_KP_End 0xFF9C
-#define XK_KP_Delete 0xFF9F
-
-extern MagickExport Status
- XInitImage(XImage *ximage);
-#endif
-
-#if defined(PRE_R5_ICCCM)
-extern MagickExport XrmDatabase
- XrmGetDatabase();
-#endif
-
-#if defined(PRE_R4_ICCCM)
-#if defined(vms)
-#define XMaxRequestSize(display) 16384
-#endif
-
-#define WithdrawnState 0
-
-typedef struct _XTextProperty
-{
- unsigned char
- *value;
-
- Atom
- encoding;
-
- int
- format;
-
- size_t
- nitems;
-} XTextProperty;
-
-char
- *XResourceManagerString();
-
-extern MagickExport int
- XWMGeometry();
-
-extern MagickExport Status
- XGetRGBColormaps(),
- XGetWMName(),
- XReconfigureWMWindow(),
- XSetWMProtocols(),
- XWithdrawWindow();
-
-extern MagickExport XClassHint
- *XAllocClassHint();
-
-extern MagickExport XIconSize
- *XAllocIconSize();
-
-extern MagickExport XSizeHints
- *XAllocSizeHints();
-
-extern MagickExport XStandardColormap
- *XAllocStandardColormap();
-
-extern MagickExport XWMHints
- *XAllocWMHints();
-
-extern MagickExport VisualID
- XVisualIDFromVisual();
-
-extern MagickExport void
- XrmDestroyDatabase(),
- XSetWMIconName(),
- XSetWMName(),
- XSetWMProperties();
-#else
-#endif
-
-#if defined(__cplusplus) || defined(c_plusplus)
-}
-#endif
-
-#endif
diff --git a/MagickCore/opencl.c b/MagickCore/opencl.c
index a703f27..1a1fd19 100644
--- a/MagickCore/opencl.c
+++ b/MagickCore/opencl.c
@@ -2963,7 +2963,7 @@
if (clEnv->OpenCLInitialized && !clEnv->OpenCLDisabled)
{
allocSize = GetOpenCLDeviceMaxMemAllocSize(clEnv);
- fprintf(log, "Devic Max Memory Alloc Size: %ld\n", allocSize);
+ fprintf(log, "Devic Max Memory Alloc Size: %lu\n", allocSize);
}
fclose(log);
diff --git a/Makefile.in b/Makefile.in
index 1a95b56..ed9d987 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -455,26 +455,24 @@
MagickCore/option-private.h MagickCore/paint.c \
MagickCore/paint.h MagickCore/pixel.c MagickCore/pixel.h \
MagickCore/pixel-accessor.h MagickCore/pixel-private.h \
- MagickCore/policy.c MagickCore/policy.h \
- MagickCore/PreRvIcccm.c MagickCore/PreRvIcccm.h \
- MagickCore/prepress.c MagickCore/prepress.h \
- MagickCore/property.c MagickCore/property.h \
- MagickCore/profile.c MagickCore/profile.h \
- MagickCore/profile-private.h MagickCore/quantize.c \
- MagickCore/quantize.h MagickCore/quantum.c \
- MagickCore/quantum.h MagickCore/quantum-export.c \
- MagickCore/quantum-import.c MagickCore/quantum-private.h \
- MagickCore/random.c MagickCore/random_.h \
- MagickCore/random-private.h MagickCore/registry.c \
- MagickCore/registry.h MagickCore/resample.c \
- MagickCore/resample.h MagickCore/resample-private.h \
- MagickCore/resize.c MagickCore/resize.h \
- MagickCore/resize-private.h MagickCore/resource.c \
- MagickCore/resource_.h MagickCore/resource-private.h \
- MagickCore/segment.c MagickCore/segment.h \
- MagickCore/semaphore.c MagickCore/semaphore.h \
- MagickCore/semaphore-private.h MagickCore/shear.c \
- MagickCore/shear.h MagickCore/signature.c \
+ MagickCore/policy.c MagickCore/policy.h MagickCore/prepress.c \
+ MagickCore/prepress.h MagickCore/property.c \
+ MagickCore/property.h MagickCore/profile.c \
+ MagickCore/profile.h MagickCore/profile-private.h \
+ MagickCore/quantize.c MagickCore/quantize.h \
+ MagickCore/quantum.c MagickCore/quantum.h \
+ MagickCore/quantum-export.c MagickCore/quantum-import.c \
+ MagickCore/quantum-private.h MagickCore/random.c \
+ MagickCore/random_.h MagickCore/random-private.h \
+ MagickCore/registry.c MagickCore/registry.h \
+ MagickCore/resample.c MagickCore/resample.h \
+ MagickCore/resample-private.h MagickCore/resize.c \
+ MagickCore/resize.h MagickCore/resize-private.h \
+ MagickCore/resource.c MagickCore/resource_.h \
+ MagickCore/resource-private.h MagickCore/segment.c \
+ MagickCore/segment.h MagickCore/semaphore.c \
+ MagickCore/semaphore.h MagickCore/semaphore-private.h \
+ MagickCore/shear.c MagickCore/shear.h MagickCore/signature.c \
MagickCore/signature.h MagickCore/signature-private.h \
MagickCore/splay-tree.c MagickCore/splay-tree.h \
MagickCore/static.c MagickCore/static.h MagickCore/statistic.c \
@@ -586,7 +584,6 @@
MagickCore/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-paint.lo \
MagickCore/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-pixel.lo \
MagickCore/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-policy.lo \
- MagickCore/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-PreRvIcccm.lo \
MagickCore/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-prepress.lo \
MagickCore/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-property.lo \
MagickCore/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-profile.lo \
@@ -2740,6 +2737,7 @@
MAGICK_DEP_LIBS = @MAGICK_DEP_LIBS@
MAGICK_FEATURES = @MAGICK_FEATURES@
MAGICK_FILTER_MODULE_PATH = @MAGICK_FILTER_MODULE_PATH@
+MAGICK_GIT_REVISION = @MAGICK_GIT_REVISION@
MAGICK_HDRI = @MAGICK_HDRI@
MAGICK_LDFLAGS = @MAGICK_LDFLAGS@
MAGICK_LIBRARY_AGE = @MAGICK_LIBRARY_AGE@
@@ -2757,7 +2755,6 @@
MAGICK_MINOR_VERSION = @MAGICK_MINOR_VERSION@
MAGICK_PATCHLEVEL_VERSION = @MAGICK_PATCHLEVEL_VERSION@
MAGICK_PCFLAGS = @MAGICK_PCFLAGS@
-MAGICK_SVN_REVISION = @MAGICK_SVN_REVISION@
MAGICK_TARGET_CPU = @MAGICK_TARGET_CPU@
MAGICK_TARGET_OS = @MAGICK_TARGET_OS@
MAGICK_TARGET_VENDOR = @MAGICK_TARGET_VENDOR@
@@ -4376,8 +4373,6 @@
MagickCore/pixel-private.h \
MagickCore/policy.c \
MagickCore/policy.h \
- MagickCore/PreRvIcccm.c \
- MagickCore/PreRvIcccm.h \
MagickCore/prepress.c \
MagickCore/prepress.h \
MagickCore/property.c \
@@ -4475,7 +4470,6 @@
MAGICKCORE_INCLUDE_HDRS = \
MagickCore/MagickCore.h \
- MagickCore/PreRvIcccm.h \
MagickCore/accelerate.h \
MagickCore/animate.h \
MagickCore/annotate.h \
@@ -5758,9 +5752,6 @@
MagickCore/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-policy.lo: \
MagickCore/$(am__dirstamp) \
MagickCore/$(DEPDIR)/$(am__dirstamp)
-MagickCore/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-PreRvIcccm.lo: \
- MagickCore/$(am__dirstamp) \
- MagickCore/$(DEPDIR)/$(am__dirstamp)
MagickCore/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-prepress.lo: \
MagickCore/$(am__dirstamp) \
MagickCore/$(DEPDIR)/$(am__dirstamp)
@@ -7271,7 +7262,6 @@
@AMDEP_TRUE@@am__include@ @am__quote@Magick++/tests/$(DEPDIR)/Magick___tests_morphImages-morphImages.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@Magick++/tests/$(DEPDIR)/Magick___tests_readWriteBlob-readWriteBlob.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@Magick++/tests/$(DEPDIR)/Magick___tests_readWriteImages-readWriteImages.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@MagickCore/$(DEPDIR)/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-PreRvIcccm.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@MagickCore/$(DEPDIR)/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-accelerate.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@MagickCore/$(DEPDIR)/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-animate.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@MagickCore/$(DEPDIR)/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-annotate.Plo@am__quote@
@@ -8090,13 +8080,6 @@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o MagickCore/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-policy.lo `test -f 'MagickCore/policy.c' || echo '$(srcdir)/'`MagickCore/policy.c
-MagickCore/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-PreRvIcccm.lo: MagickCore/PreRvIcccm.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT MagickCore/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-PreRvIcccm.lo -MD -MP -MF MagickCore/$(DEPDIR)/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-PreRvIcccm.Tpo -c -o MagickCore/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-PreRvIcccm.lo `test -f 'MagickCore/PreRvIcccm.c' || echo '$(srcdir)/'`MagickCore/PreRvIcccm.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) MagickCore/$(DEPDIR)/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-PreRvIcccm.Tpo MagickCore/$(DEPDIR)/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-PreRvIcccm.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='MagickCore/PreRvIcccm.c' object='MagickCore/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-PreRvIcccm.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o MagickCore/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-PreRvIcccm.lo `test -f 'MagickCore/PreRvIcccm.c' || echo '$(srcdir)/'`MagickCore/PreRvIcccm.c
-
MagickCore/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-prepress.lo: MagickCore/prepress.c
@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT MagickCore/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-prepress.lo -MD -MP -MF MagickCore/$(DEPDIR)/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-prepress.Tpo -c -o MagickCore/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-prepress.lo `test -f 'MagickCore/prepress.c' || echo '$(srcdir)/'`MagickCore/prepress.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) MagickCore/$(DEPDIR)/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-prepress.Tpo MagickCore/$(DEPDIR)/MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-prepress.Plo
diff --git a/config/configure.xml b/config/configure.xml
index c365a03..eb385cd 100644
--- a/config/configure.xml
+++ b/config/configure.xml
@@ -34,10 +34,10 @@
<configure name="PCFLAGS" value="-fopenmp -DMAGICKCORE_HDRI_ENABLE=1 -DMAGICKCORE_QUANTUM_DEPTH=16"/>
<configure name="PREFIX" value="/usr/local"/>
<configure name="QuantumDepth" value="16"/>
- <configure name="RELEASE_DATE" value="2015-08-28"/>
+ <configure name="RELEASE_DATE" value="2015-09-05"/>
<configure name="SHAREARCH_PATH" value="/usr/local/lib/ImageMagick-7.0.0/config-Q16HDRI"/>
<configure name="SHARE_PATH" value="/usr/local/share/ImageMagick-7"/>
- <configure name="GIT_REVISION" value="@MAGICK_GIT_REVISION@" />
+ <configure name="GIT_REVISION" value="Unversioned" />
<configure name="TARGET_CPU" value="x86_64"/>
<configure name="TARGET_OS" value="linux-gnu"/>
<configure name="TARGET_VENDOR" value="unknown"/>