(no commit message)

diff --git a/MagickCore/magick-baseconfig.h b/MagickCore/magick-baseconfig.h
index 553adaaed501528d701aed25fd66b550bfbf8e2e..e5b38f4bc54612d60f617b38e45cbde2ebb603bd 100644 (file)
--- a/MagickCore/magick-baseconfig.h
+++ b/MagickCore/magick-baseconfig.h
@@ -1047,9 +1047,7 @@
 /* #undef HAVE__ALIGNED_MALLOC */
 
 /* Define to 1 if the system has the type `_Bool'. */
-#ifndef MAGICKCORE_HAVE__BOOL
-#define MAGICKCORE_HAVE__BOOL 1
-#endif
+/* #undef HAVE__BOOL */
 
 /* Define to 1 if you have the `_exit' function. */
 #ifndef MAGICKCORE_HAVE__EXIT

diff --git a/MagickCore/methods.h b/MagickCore/methods.h
index 4030d44031264ef9fd967d9e94581d815e8bb12a..d387cbcabf797a8565fccd09e7f4fae6a7adebf2 100644 (file)
--- a/MagickCore/methods.h
+++ b/MagickCore/methods.h
@@ -905,6 +905,7 @@ extern "C" {
 #define RegisterIPLImage  PrependMagickMethod(RegisterIPLImage)
 #define RegisterJP2Image  PrependMagickMethod(RegisterJP2Image)
 #define RegisterJPEGImage  PrependMagickMethod(RegisterJPEGImage)
+#define RegisterJSONImage  PrependMagickMethod(RegisterJSONImage)
 #define RegisterLABELImage  PrependMagickMethod(RegisterLABELImage)
 #define RegisterMCPImage  PrependMagickMethod(RegisterMACImage)
 #define RegisterMAGICKImage  PrependMagickMethod(RegisterMAGICKImage)
@@ -1235,6 +1236,7 @@ extern "C" {
 #define UnregisterIPLImage  PrependMagickMethod(UnregisterIPLImage)
 #define UnregisterJP2Image  PrependMagickMethod(UnregisterJP2Image)
 #define UnregisterJPEGImage  PrependMagickMethod(UnregisterJPEGImage)
+#define UnregisterJSONImage  PrependMagickMethod(UnregisterJSONImage)
 #define UnregisterLABELImage  PrependMagickMethod(UnregisterLABELImage)
 #define UnregisterMACImage  PrependMagickMethod(UnregisterMACImage)
 #define UnregisterMAGICKImage  PrependMagickMethod(UnregisterMAGICKImage)

diff --git a/MagickCore/version.h b/MagickCore/version.h
index 0ed2633c81d653431ee1bb9c273587199e79c672..e7d6a669bc8dd2f714a42eaeda5274575e6bae2b 100644 (file)
--- a/MagickCore/version.h
+++ b/MagickCore/version.h
@@ -27,7 +27,7 @@ extern "C" {
 */
 #define MagickPackageName "ImageMagick"
 #define MagickCopyright  "Copyright (C) 1999-2014 ImageMagick Studio LLC"
-#define MagickSVNRevision  "14502:14520"
+#define MagickSVNRevision  "14671"
 #define MagickLibVersion  0x700
 #define MagickLibVersionText  "7.0.0"
 #define MagickLibVersionNumber  1,0,0
@@ -48,7 +48,7 @@ extern "C" {
 #define MagickppLibAddendum  "-0"
 #define MagickppLibInterface  1
 #define MagickppLibMinInterface  1
-#define MagickReleaseDate  "2014-01-19"
+#define MagickReleaseDate  "2014-01-29"
 #define MagickChangeDate   "20120427"
 #define MagickAuthoritativeURL  "http://www.imagemagick.org"
 #define MagickFeatures "DPC HDRI OpenMP"

diff --git a/MagickWand/drawing-wand.c b/MagickWand/drawing-wand.c
index a3ef2f047128a482650778953fb324ae2348b9b2..2581c86dcc6f20c1d6cf0ec19d68cce6325c195d 100644 (file)
--- a/MagickWand/drawing-wand.c
+++ b/MagickWand/drawing-wand.c
@@ -5542,7 +5542,7 @@ WandExport MagickBooleanType DrawSetStrokeDashArray(DrawingWand *wand,
                 wand->name);
               return(MagickFalse);
             }
-          for (i=0; i < n_new; i++)
+          for (i=0; i < (ssize_t) n_new; i++)
           {
             CurrentContext->dash_pattern[i]=0.0;
             if (dasharray != (double *) NULL)
@@ -5556,7 +5556,7 @@ WandExport MagickBooleanType DrawSetStrokeDashArray(DrawingWand *wand,
       else
         if (dasharray != (double *) NULL)
           {
-            for (i=0; i < n_new; i++)
+            for (i=0; i < (ssize_t) n_new; i++)
             {
               if (i != 0)
                 (void) MvgPrintf(wand,",");

diff --git a/Makefile.in b/Makefile.in
index c0cf1a9e813c37f388697402fdb4223a610b3b00..590288e7f6c61576abf81a0e2c7cb5488de9f40b 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -418,8 +418,9 @@ am_Magick___lib_libMagick___@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la_OBJECT
        Magick++/lib/Functions.lo Magick++/lib/Geometry.lo \
        Magick++/lib/Image.lo Magick++/lib/ImageRef.lo \
        Magick++/lib/Montage.lo Magick++/lib/Options.lo \
-       Magick++/lib/Pixels.lo Magick++/lib/STL.lo \
-       Magick++/lib/Thread.lo Magick++/lib/TypeMetric.lo
+       Magick++/lib/Pixels.lo Magick++/lib/ResourceLimits.lo \
+       Magick++/lib/STL.lo Magick++/lib/Thread.lo \
+       Magick++/lib/TypeMetric.lo
 Magick___lib_libMagick___@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la_OBJECTS = $(am_Magick___lib_libMagick___@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la_OBJECTS)
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
@@ -4782,6 +4783,7 @@ Magick___lib_libMagick___@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la_SOURCES =
        Magick++/lib/Montage.cpp \
        Magick++/lib/Options.cpp \
        Magick++/lib/Pixels.cpp \
+       Magick++/lib/ResourceLimits.cpp \
        Magick++/lib/STL.cpp \
        Magick++/lib/Thread.cpp \
        Magick++/lib/TypeMetric.cpp \
@@ -4800,6 +4802,7 @@ Magick___lib_libMagick___@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la_SOURCES =
        Magick++/lib/Magick++/Montage.h \
        Magick++/lib/Magick++/Options.h \
        Magick++/lib/Magick++/Pixels.h \
+       Magick++/lib/Magick++/ResourceLimits.h \
        Magick++/lib/Magick++/STL.h \
        Magick++/lib/Magick++/Thread.h \
        Magick++/lib/Magick++/TypeMetric.h
@@ -5416,6 +5419,8 @@ Magick++/lib/Options.lo: Magick++/lib/$(am__dirstamp) \
        Magick++/lib/$(DEPDIR)/$(am__dirstamp)
 Magick++/lib/Pixels.lo: Magick++/lib/$(am__dirstamp) \
        Magick++/lib/$(DEPDIR)/$(am__dirstamp)
+Magick++/lib/ResourceLimits.lo: Magick++/lib/$(am__dirstamp) \
+       Magick++/lib/$(DEPDIR)/$(am__dirstamp)
 Magick++/lib/STL.lo: Magick++/lib/$(am__dirstamp) \
        Magick++/lib/$(DEPDIR)/$(am__dirstamp)
 Magick++/lib/Thread.lo: Magick++/lib/$(am__dirstamp) \
@@ -7050,6 +7055,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@Magick++/lib/$(DEPDIR)/Montage.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@Magick++/lib/$(DEPDIR)/Options.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@Magick++/lib/$(DEPDIR)/Pixels.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@Magick++/lib/$(DEPDIR)/ResourceLimits.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@Magick++/lib/$(DEPDIR)/STL.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@Magick++/lib/$(DEPDIR)/Thread.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@Magick++/lib/$(DEPDIR)/TypeMetric.Plo@am__quote@

diff --git a/PerlMagick/Makefile.PL b/PerlMagick/Makefile.PL
index f5b1b7eea4c3eb0a04f37b00ed3d6968362f3939..e36832d033c8b0296a3695397b3b7106ebdc9745 100644 (file)
--- a/PerlMagick/Makefile.PL
+++ b/PerlMagick/Makefile.PL
@@ -206,7 +206,7 @@ WriteMakefile
    'INC'       => $INC_magick,
 
    # C compiler
-   #'CC' => 'gcc -std=gnu99 -std=gnu99',
+   #'CC' => 'c++',
 
    # C pre-processor flags (e.g. -I & -D options)
    # 'CPPFLAGS' => "$Config{'cppflags'} -pthread -I/usr/include/pango-1.0 -I/usr/include/cairo -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libdrm -I/usr/include/libpng16 -I/usr/include/freetype2 -DMAGICKCORE_HDRI_ENABLE=1 -DMAGICKCORE_QUANTUM_DEPTH=16 -I/usr/include/libxml2",
@@ -215,7 +215,7 @@ WriteMakefile
    'CCFLAGS' => $CCFLAGS_magick,
 
    # Linker
-   #'LD' => $Config{'ld'} == $Config{'cc'} ? 'gcc -std=gnu99 -std=gnu99' : $Config{'ld'},
+   #'LD' => $Config{'ld'} == $Config{'cc'} ? 'c++' : $Config{'ld'},
 
    # Linker flags for building an executable
    'LDFLAGS' =>  $LDFLAGS_magick,

diff --git a/PerlMagick/check.sh b/PerlMagick/check.sh
index 4edd1f6137b67db499160c410e6f1a046334c466..7d926bfb53aaa61b58d080c22715ec4f59bddee9 100755 (executable)
--- a/PerlMagick/check.sh
+++ b/PerlMagick/check.sh
@@ -42,10 +42,10 @@ fi
 
 if test -x PerlMagick -a -f Makefile.aperl ; then
   # Static build test incantation
-  ${MAKE} -f Makefile.aperl CC='gcc -std=gnu99 -std=gnu99' TEST_VERBOSE=1 test
+  ${MAKE} -f Makefile.aperl CC='c++' TEST_VERBOSE=1 test
 elif test -f Makefile -a -f Magick.o; then
   # Shared build test incantation
-  ${MAKE} CC='gcc -std=gnu99 -std=gnu99' TEST_VERBOSE=1 test
+  ${MAKE} CC='c++' TEST_VERBOSE=1 test
 else
   echo 'PerlMagick has not been built!'
   exit 1

diff --git a/coders/dcm.c b/coders/dcm.c
index dddc4182c3c4b1cd7c0eac4815c60f962613aeb3..0964c9ec23f0f4bb2f173ab5e0cea71b011a10ac 100644 (file)
--- a/coders/dcm.c
+++ b/coders/dcm.c
@@ -3074,7 +3074,7 @@ static Image *ReadDCMImage(const ImageInfo *image_info,ExceptionInfo *exception)
               data[length*quantum]='\0';
             }
           else
-            if (datum == 0xFFFFFFFFU)
+            if (datum == 0xFFFFFFFFL)
               {
                 sequence=MagickTrue;
                 continue;

diff --git a/coders/icon.c b/coders/icon.c
index 98042408bffe7fba0145a9a8339d127b1cc501c8..c631e27cb02f9e9a6d2675a2782c6a44ede717c0 100644 (file)
--- a/coders/icon.c
+++ b/coders/icon.c
@@ -323,8 +323,8 @@ static Image *ReadICONImage(const ImageInfo *image_info,
     icon_info.height=(unsigned char) ((int) ReadBlobLSBLong(image)/2);
     icon_info.planes=ReadBlobLSBShort(image);
     icon_info.bits_per_pixel=ReadBlobLSBShort(image);
-    if ((icon_info.planes == 18505) && (icon_info.bits_per_pixel == 21060) || 
-         icon_info.size == 0x474e5089)
+    if (((icon_info.planes == 18505) && (icon_info.bits_per_pixel == 21060)) || 
+        (icon_info.size == 0x474e5089))
       {
         Image
           *icon_image;

diff --git a/coders/json.c b/coders/json.c
index cbe5db2bda932ff329ee28d9bd6d2945206e87f3..31cd9757597501ef339da377124b12282961ad38 100644 (file)
--- a/coders/json.c
+++ b/coders/json.c
@@ -40,60 +40,40 @@
   Include declarations.
 */
 #include "MagickCore/studio.h"
-#include "MagickCore/annotate.h"
 #include "MagickCore/artifact.h"
 #include "MagickCore/attribute.h"
 #include "MagickCore/blob.h"
 #include "MagickCore/blob-private.h"
 #include "MagickCore/cache.h"
-#include "MagickCore/client.h"
-#include "MagickCore/coder.h"
-#include "MagickCore/color.h"
-#include "MagickCore/configure.h"
+#include "MagickCore/colorspace.h"
+#include "MagickCore/colorspace-private.h"
 #include "MagickCore/constitute.h"
-#include "MagickCore/decorate.h"
-#include "MagickCore/delegate.h"
-#include "MagickCore/draw.h"
-#include "MagickCore/effect.h"
 #include "MagickCore/exception.h"
 #include "MagickCore/exception-private.h"
 #include "MagickCore/feature.h"
-#include "MagickCore/gem.h"
-#include "MagickCore/geometry.h"
-#include "MagickCore/histogram.h"
-#include "MagickCore/identify.h"
 #include "MagickCore/image.h"
 #include "MagickCore/image-private.h"
 #include "MagickCore/list.h"
-#include "MagickCore/locale_.h"
-#include "MagickCore/log.h"
-#include "MagickCore/magic.h"
 #include "MagickCore/magick.h"
 #include "MagickCore/memory_.h"
-#include "MagickCore/module.h"
 #include "MagickCore/monitor.h"
 #include "MagickCore/monitor-private.h"
-#include "MagickCore/montage.h"
 #include "MagickCore/option.h"
+#include "MagickCore/pixel.h"
 #include "MagickCore/pixel-accessor.h"
+#include "MagickCore/pixel-private.h"
 #include "MagickCore/prepress.h"
-#include "MagickCore/profile.h"
 #include "MagickCore/property.h"
-#include "MagickCore/quantize.h"
-#include "MagickCore/quantum.h"
-#include "MagickCore/random_.h"
+#include "MagickCore/quantum-private.h"
 #include "MagickCore/registry.h"
-#include "MagickCore/resize.h"
-#include "MagickCore/resource_.h"
 #include "MagickCore/signature.h"
+#include "MagickCore/static.h"
 #include "MagickCore/statistic.h"
 #include "MagickCore/string_.h"
 #include "MagickCore/string-private.h"
-#include "MagickCore/timer.h"
-#include "MagickCore/token.h"
 #include "MagickCore/utility.h"
-#include "MagickCore/utility-private.h"
 #include "MagickCore/version.h"
+#include "MagickCore/module.h"
 \f
 /*
   Forward declarations.

diff --git a/configure b/configure
index e98aa6338d28b0f943ad4493c417489ad2c16d67..9551ad3ecd81498ba706ff621a8e5d9a57a7de28 100755 (executable)
--- a/configure
+++ b/configure
@@ -3698,7 +3698,7 @@ MAGICK_PATCHLEVEL_VERSION=0
 
 MAGICK_VERSION=7.0.0-0
 
-MAGICK_SVN_REVISION=14502:14520
+MAGICK_SVN_REVISION=14671
 
 
 # Substitute library versioning