From 6df5a4bfce60a10724b77fa67b21c57988349b41 Mon Sep 17 00:00:00 2001 From: cristy Date: Tue, 28 Feb 2012 21:30:00 +0000 Subject: [PATCH] --- MagickCore/version.h | 4 ++-- MagickWand/Makefile.am | 2 ++ Makefile.in | 2 ++ config/ImageMagick.rdf | 4 ++-- config/configure.xml | 4 ++-- configure | 2 +- 6 files changed, 11 insertions(+), 7 deletions(-) diff --git a/MagickCore/version.h b/MagickCore/version.h index 1b05cb121..813809e1b 100644 --- a/MagickCore/version.h +++ b/MagickCore/version.h @@ -27,14 +27,14 @@ extern "C" { */ #define MagickPackageName "ImageMagick" #define MagickCopyright "Copyright (C) 1999-2012 ImageMagick Studio LLC" -#define MagickSVNRevision "6961" +#define MagickSVNRevision "6986" #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-02-25" +#define MagickReleaseDate "2012-02-28" #define MagickChangeDate "20110801" #define MagickAuthoritativeURL "http://www.imagemagick.org" #if defined(MAGICKCORE_OPENMP_SUPPORT) diff --git a/MagickWand/Makefile.am b/MagickWand/Makefile.am index c24dedc79..c5ac435bf 100644 --- a/MagickWand/Makefile.am +++ b/MagickWand/Makefile.am @@ -55,6 +55,7 @@ MAGICKWAND_SOURCES = \ MagickWand/montage.h \ MagickWand/operation.c \ MagickWand/operation.h \ + MagickWand/operation-private.h \ MagickWand/pixel-iterator.c \ MagickWand/pixel-iterator.h \ MagickWand/pixel-wand.c \ @@ -95,6 +96,7 @@ MAGICKWAND_INCLUDE_HDRS = \ MAGICKWAND_NOINST_HDRS = \ MagickWand/mogrify-private.h \ MagickWand/magick-wand-private.h \ + MagickWand/operation-private.h \ MagickWand/pixel-wand-private.h \ MagickWand/studio.h \ MagickWand/wand.h diff --git a/Makefile.in b/Makefile.in index d35eadc1c..ae21a882a 100644 --- a/Makefile.in +++ b/Makefile.in @@ -4378,6 +4378,7 @@ MAGICKWAND_SOURCES = \ MagickWand/montage.h \ MagickWand/operation.c \ MagickWand/operation.h \ + MagickWand/operation-private.h \ MagickWand/pixel-iterator.c \ MagickWand/pixel-iterator.h \ MagickWand/pixel-wand.c \ @@ -4418,6 +4419,7 @@ MAGICKWAND_INCLUDE_HDRS = \ MAGICKWAND_NOINST_HDRS = \ MagickWand/mogrify-private.h \ MagickWand/magick-wand-private.h \ + MagickWand/operation-private.h \ MagickWand/pixel-wand-private.h \ MagickWand/studio.h \ MagickWand/wand.h diff --git a/config/ImageMagick.rdf b/config/ImageMagick.rdf index 4e18ce82a..570f5c33c 100644 --- a/config/ImageMagick.rdf +++ b/config/ImageMagick.rdf @@ -5,7 +5,7 @@ ImageMagick ImageMagick: convert, edit, and compose images. - 2012-02-25 + 2012-02-28 ImageMagick® is a software suite to create, edit, compose, or convert bitmap images. It can read and write images in a variety of formats (over 100) including DPX, EXR, GIF, JPEG, JPEG-2000, PDF, PhotoCD, PNG, Postscript, SVG, and TIFF. Use ImageMagick to resize, flip, mirror, rotate, distort, shear and transform images, adjust image colors, apply various special effects, or draw text, lines, polygons, ellipses and Bézier curves. @@ -57,7 +57,7 @@ Examples of ImageMagick Usage shows how to use ImageMagick from the command-line stable - 2012-02-25 + 2012-02-28 7.0.0 diff --git a/config/configure.xml b/config/configure.xml index 1a9d8e23b..04616a192 100644 --- a/config/configure.xml +++ b/config/configure.xml @@ -10,8 +10,8 @@ - - + + diff --git a/configure b/configure index 0cc2afa7c..ff9da4ba5 100755 --- a/configure +++ b/configure @@ -3612,7 +3612,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=6961 +MAGICK_SVN_REVISION=6986 -- 2.40.0