(no commit message)

diff --git a/MagickCore/version.h b/MagickCore/version.h
index be541ba349adee22590794b4db74365aab52c23c..ec69556fa155bb0a508ac86b53452685c2d54c57 100644 (file)
--- a/MagickCore/version.h
+++ b/MagickCore/version.h
@@ -27,15 +27,15 @@ extern "C" {
 */
 #define MagickPackageName "ImageMagick"
 #define MagickCopyright  "Copyright (C) 1999-2012 ImageMagick Studio LLC"
-#define MagickSVNRevision  "9450:9476M"
+#define MagickSVNRevision  "9533:9553M"
 #define MagickLibVersion  0x700
 #define MagickLibVersionText  "7.0.0"
 #define MagickLibVersionNumber  7,0,0
 #define MagickLibAddendum  "-0"
 #define MagickLibInterface  7
 #define MagickLibMinInterface  7
-#define MagickReleaseDate  "2012-09-30"
-#define MagickChangeDate   "20120911"
+#define MagickReleaseDate  "2012-10-08"
+#define MagickChangeDate   "20121005"
 #define MagickAuthoritativeURL  "http://www.imagemagick.org"
 #if defined(MAGICKCORE_OPENMP_SUPPORT)
 #define MagickOpenMPFeature  "OpenMP "

diff --git a/Makefile.in b/Makefile.in
index c89a5137acc60bba37ec5e074e1d7884166c419b..6f3e05bc2e7336df06aa24cc811b675762874436 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -3032,6 +3032,7 @@ CONFIG_EXTRA_DIST = \
        config/delegates.xml.in \
        config/english.xml \
        config/francais.xml \
+       config/ImageMagick.rc \
        config/ImageMagick.rdf.in \
        config/lndir.sh \
        config/locale.xml \
@@ -4968,6 +4969,7 @@ TESTS_TESTS = \
 
 TESTS_EXTRA_DIST = \
        tests/common.shi \
+  tests/rose.pnm \
   tests/input_256c.miff \
   tests/input_bilevel.miff \
   tests/input_gray.miff \

diff --git a/config/ImageMagick.rc b/config/ImageMagick.rc
new file mode 100644 (file)
index 0000000..f90a3c6
--- /dev/null
+++ b/config/ImageMagick.rc
@@ -0,0 +1,71 @@
+#include "winver.h"
+#define __WINDOWS__
+#include "..\\..\\MagickCore\\magick-config.h"
+#include "..\\..\\MagickCore\\version.h"
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version
+//
+/////////////////////////////////////////////////////////////////////////////
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION MagickLibVersionNumber
+ PRODUCTVERSION MagickLibVersionNumber
+ FILEFLAGSMASK 0x3fL
+#ifdef _DEBUG
+ FILEFLAGS 0x1L
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS 0x40004L
+ FILETYPE 0x1L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"
+        BEGIN
+            VALUE "ProductName", "ImageMagick\0"
+            VALUE "FileDescription", "ImageMagick Studio library and utility programs\0"
+            VALUE "OriginalFilename", "ImageMagick\0"
+            VALUE "InternalName", "ImageMagick\0"
+            VALUE "FileVersion", MagickLibVersionText "\0"
+            VALUE "ProductVersion", MagickLibVersionText "\0"
+            VALUE "CompanyName", "ImageMagick Studio\0"
+            VALUE "LegalCopyright", MagickCopyright "\0"
+            VALUE "Comments", MagickVersion "\0"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200
+    END
+END
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// IMAGEMAGICK
+//
+/////////////////////////////////////////////////////////////////////////////
+
+CODER.XML      IMAGEMAGICK DISCARDABLE "..\\bin\\coder.xml"
+COLORS.XML     IMAGEMAGICK DISCARDABLE "..\\bin\\colors.xml"
+CONFIGURE.XML     IMAGEMAGICK DISCARDABLE "..\\bin\\configure.xml"
+DELEGATES.XML  IMAGEMAGICK DISCARDABLE "..\\bin\\delegates.xml"
+ENGLISH.XML    IMAGEMAGICK DISCARDABLE "..\\bin\\english.xml"
+LOCALE.XML     IMAGEMAGICK DISCARDABLE "..\\bin\\locale.xml"
+LOG.XML        IMAGEMAGICK DISCARDABLE "..\\bin\\log.xml"
+MAGIC.XML      IMAGEMAGICK DISCARDABLE "..\\bin\\magic.xml"
+THRESHOLDS.XML  IMAGEMAGICK DISCARDABLE "..\\bin\\thresholds.xml"
+TYPE.XML       IMAGEMAGICK DISCARDABLE "..\\bin\\type.xml"
+TYPE-GHOSTSCRIPT.XML  IMAGEMAGICK DISCARDABLE "..\\bin\\type-ghostscript.xml"
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Icon
+//
+/////////////////////////////////////////////////////////////////////////////
+
+IDR_MAGICKICON          ICON    DISCARDABLE     "..\\..\\images\\ImageMagick.ico"

diff --git a/config/Makefile.am b/config/Makefile.am
index 7824ba6bf8245509c37c80f7f44af7708270bb15..645d5df9637c6cea783497ab4b91643bd9596d9c 100644 (file)
--- a/config/Makefile.am
+++ b/config/Makefile.am
@@ -53,6 +53,7 @@ CONFIG_EXTRA_DIST = \
        config/delegates.xml.in \
        config/english.xml \
        config/francais.xml \
+       config/ImageMagick.rc \
        config/ImageMagick.rdf.in \
        config/lndir.sh \
        config/locale.xml \

diff --git a/configure b/configure
index 417d243e23afd5900de2f8b0dbd87f8592fdbc78..15381183a698e8d8bebaef86f31486b21ded16e5 100755 (executable)
--- a/configure
+++ b/configure
@@ -3670,7 +3670,7 @@ MAGICK_LIBRARY_CURRENT_MIN=`expr $MAGICK_LIBRARY_CURRENT - $MAGICK_LIBRARY_AGE`
 
 MAGICK_LIBRARY_VERSION_INFO=$MAGICK_LIBRARY_CURRENT:$MAGICK_LIBRARY_REVISION:$MAGICK_LIBRARY_AGE
 
-MAGICK_SVN_REVISION=9450:9476M
+MAGICK_SVN_REVISION=9533:9553M