--no commit message

--no commit message

Magick++/Makefile.am

@@ -140,7 +140,7 @@ endif
 Magick___lib_libMagick___@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la_LDFLAGS = -no-undefined \
   $(Magick___lib_libMagick___la_LDFLAGS_VERSION) $(MAGICK_LT_RELEASE_OPTS) \
   -version-info \
-  $(MAGICK_LIBRARY_CURRENT):$(MAGICK_LIBRARY_REVISION):$(MAGICK_LIBRARY_AGE)
+  $(MAGICKPP_LIBRARY_CURRENT):$(MAGICKPP_LIBRARY_REVISION):$(MAGICKPP_LIBRARY_AGE)
 Magick___lib_libMagick___@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la_LIBADD = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS)
 
 MAGICKPP_CHECK_PGRMS_OPT = \

Magick++/lib/libMagick++.map

- VERS_1.0 {
+ VERS_2.0 {
      	 global:
      		 *;
      };

Makefile.in

@@ -2641,6 +2641,13 @@ LZMA_CFLAGS = @LZMA_CFLAGS@
 LZMA_LIBS = @LZMA_LIBS@
 LaunchDelegate = @LaunchDelegate@
 MAGICKCORE_PATH = @MAGICKCORE_PATH@
+MAGICKPP_LIBRARY_AGE = @MAGICKPP_LIBRARY_AGE@
+MAGICKPP_LIBRARY_CURRENT = @MAGICKPP_LIBRARY_CURRENT@
+MAGICKPP_LIBRARY_CURRENT_MIN = @MAGICKPP_LIBRARY_CURRENT_MIN@
+MAGICKPP_LIBRARY_REVISION = @MAGICKPP_LIBRARY_REVISION@
+MAGICKPP_LIBRARY_VERSION_INFO = @MAGICKPP_LIBRARY_VERSION_INFO@
+MAGICKPP_LIB_VERSION = @MAGICKPP_LIB_VERSION@
+MAGICKPP_LIB_VERSION_TEXT = @MAGICKPP_LIB_VERSION_TEXT@
 MAGICK_ABI_SUFFIX = @MAGICK_ABI_SUFFIX@
 MAGICK_CFLAGS = @MAGICK_CFLAGS@
 MAGICK_CODER_MODULE_PATH = @MAGICK_CODER_MODULE_PATH@
@@ -4733,7 +4740,7 @@ MAGICKPP_INCHEADERS_OPT = \
 Magick___lib_libMagick___@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la_LDFLAGS = -no-undefined \
   $(Magick___lib_libMagick___la_LDFLAGS_VERSION) $(MAGICK_LT_RELEASE_OPTS) \
   -version-info \
-  $(MAGICK_LIBRARY_CURRENT):$(MAGICK_LIBRARY_REVISION):$(MAGICK_LIBRARY_AGE)
+  $(MAGICKPP_LIBRARY_CURRENT):$(MAGICKPP_LIBRARY_REVISION):$(MAGICKPP_LIBRARY_AGE)
 
 Magick___lib_libMagick___@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la_LIBADD = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS)
 MAGICKPP_CHECK_PGRMS_OPT = \

configure

@@ -998,6 +998,8 @@ BIN_DIR
 EXEC_PREFIX_DIR
 PREFIX_DIR
 CONFIG_STATUS_DEPENDENCIES
+MAGICKPP_LIB_VERSION_TEXT
+MAGICKPP_LIB_VERSION
 MAGICK_LIB_VERSION_NUMBER
 MAGICK_LIB_VERSION_TEXT
 MAGICK_LIB_VERSION
@@ -1035,6 +1037,11 @@ PACKAGE_LIB_VERSION
 PACKAGE_CHANGE_DATE
 PACKAGE_RELEASE
 PACKAGE_PERL_VERSION
+MAGICKPP_LIBRARY_VERSION_INFO
+MAGICKPP_LIBRARY_CURRENT_MIN
+MAGICKPP_LIBRARY_AGE
+MAGICKPP_LIBRARY_REVISION
+MAGICKPP_LIBRARY_CURRENT
 MAGICK_LIBRARY_VERSION_INFO
 MAGICK_LIBRARY_CURRENT_MIN
 MAGICK_LIBRARY_AGE
@@ -3675,7 +3682,7 @@ MAGICK_PATCHLEVEL_VERSION=6
 
 MAGICK_VERSION=6.8.6-6
 
-MAGICK_SVN_REVISION=12682:12685M
+MAGICK_SVN_REVISION=12682:12692M
 
 
 # Substitute library versioning
@@ -3684,6 +3691,10 @@ MAGICK_LIBRARY_CURRENT_MIN=`expr $MAGICK_LIBRARY_CURRENT - $MAGICK_LIBRARY_AGE`
 MAGICK_LIBRARY_VERSION_INFO=$MAGICK_LIBRARY_CURRENT:$MAGICK_LIBRARY_REVISION:$MAGICK_LIBRARY_AGE
 
 
+MAGICKPP_LIBRARY_CURRENT_MIN=`expr $MAGICKPP_LIBRARY_CURRENT - $MAGICKPP_LIBRARY_AGE`
+
+MAGICKPP_LIBRARY_VERSION_INFO=$MAGICKPP_LIBRARY_CURRENT:$MAGICKPP_LIBRARY_REVISION:$MAGICKPP_LIBRARY_AGE
+
 
 
 
@@ -4268,6 +4279,7 @@ fi
 AM_BACKSLASH='\'
 
 
+# versionning of library
 MAGICK_LIB_VERSION="0x"
 if test ${MAGICK_LIBRARY_CURRENT} -lt 10 ; then
   MAGICK_LIB_VERSION=${MAGICK_LIB_VERSION}0
@@ -4291,6 +4303,31 @@ MAGICK_LIB_VERSION_TEXT="${PACKAGE_VERSION}"
 MAGICK_LIB_VERSION_NUMBER="${MAGICK_LIBRARY_CURRENT},${MAGICK_LIBRARY_AGE},${MAGICK_LIBRARY_REVISION}"
 
 
+MAGICKPP_LIB_VERSION="0x"
+if test ${MAGICKPP_LIBRARY_CURRENT} -lt 10 ; then
+  MAGICKPP_LIB_VERSION=${MAGICKPP_LIB_VERSION}0
+fi
+MAGICKPP_LIB_VERSION=${MAGICKPP_LIB_VERSION}${MAGICKPP_LIBRARY_CURRENT}
+if test ${MAGICKPP_LIBRARY_AGE} -lt 10 ; then
+  MAGICKPP_LIB_VERSION=${MAGICKPP_LIB_VERSION}0
+fi
+MAGICKPP_LIB_VERSION=${MAGICKPP_LIB_VERSION}${MAGICKPP_LIBRARY_AGE}
+if test ${MAGICKPP_LIBRARY_REVISION} -lt 10 ; then
+  MAGICKPP_LIB_VERSION=${MAGICKPP_LIB_VERSION}0
+fi
+MAGICKPP_LIB_VERSION=${MAGICKPP_LIB_VERSION}${MAGICKPP_LIBRARY_REVISION}
+
+
+# Definition used to define MagickLibVersionText in version.h
+MAGICKPP_LIB_VERSION_TEXT="${PACKAGE_VERSION}"
+
+
+# Definition used to define MagickLibVersionNumber in version.h
+MAGICK_LIB_VERSION_NUMBER="${MAGICK_LIBRARY_CURRENT},${MAGICK_LIBRARY_AGE},${MAGICK_LIBRARY_REVISION}"
+
+
+
+
 # Regenerate config.status if ChangeLog or version.sh is updated.
 CONFIG_STATUS_DEPENDENCIES='$(top_srcdir)/version.sh'
 

configure.ac

@@ -137,8 +137,15 @@ AC_SUBST([MAGICK_LIBRARY_CURRENT_MIN],
          [`expr $MAGICK_LIBRARY_CURRENT - $MAGICK_LIBRARY_AGE`])
 AC_SUBST([MAGICK_LIBRARY_VERSION_INFO],
          [$MAGICK_LIBRARY_CURRENT:$MAGICK_LIBRARY_REVISION:$MAGICK_LIBRARY_AGE])
-
-
+         
+AC_SUBST(MAGICKPP_LIBRARY_CURRENT)dnl
+AC_SUBST(MAGICKPP_LIBRARY_REVISION)dnl
+AC_SUBST(MAGICKPP_LIBRARY_AGE)dnl
+AC_SUBST([MAGICKPP_LIBRARY_CURRENT_MIN],
+         [`expr $MAGICKPP_LIBRARY_CURRENT - $MAGICKPP_LIBRARY_AGE`])
+AC_SUBST([MAGICKPP_LIBRARY_VERSION_INFO],
+         [$MAGICKPP_LIBRARY_CURRENT:$MAGICKPP_LIBRARY_REVISION:$MAGICKPP_LIBRARY_AGE])
+         
 
 AC_SUBST(PACKAGE_NAME)dnl
 AC_SUBST(PACKAGE_VERSION)dnl
@@ -158,6 +165,7 @@ AM_INIT_AUTOMAKE([1.11 color-tests foreign parallel-tests silent-rules subdir-ob
 # Enable support for silent build rules
 m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
 
+# versionning of library
 MAGICK_LIB_VERSION="0x"
 if test ${MAGICK_LIBRARY_CURRENT} -lt 10 ; then
   MAGICK_LIB_VERSION=${MAGICK_LIB_VERSION}0
@@ -181,6 +189,31 @@ AC_SUBST(MAGICK_LIB_VERSION_TEXT)
 MAGICK_LIB_VERSION_NUMBER="${MAGICK_LIBRARY_CURRENT},${MAGICK_LIBRARY_AGE},${MAGICK_LIBRARY_REVISION}"
 AC_SUBST(MAGICK_LIB_VERSION_NUMBER)
 
+MAGICKPP_LIB_VERSION="0x"
+if test ${MAGICKPP_LIBRARY_CURRENT} -lt 10 ; then
+  MAGICKPP_LIB_VERSION=${MAGICKPP_LIB_VERSION}0
+fi
+MAGICKPP_LIB_VERSION=${MAGICKPP_LIB_VERSION}${MAGICKPP_LIBRARY_CURRENT}
+if test ${MAGICKPP_LIBRARY_AGE} -lt 10 ; then
+  MAGICKPP_LIB_VERSION=${MAGICKPP_LIB_VERSION}0
+fi
+MAGICKPP_LIB_VERSION=${MAGICKPP_LIB_VERSION}${MAGICKPP_LIBRARY_AGE}
+if test ${MAGICKPP_LIBRARY_REVISION} -lt 10 ; then
+  MAGICKPP_LIB_VERSION=${MAGICKPP_LIB_VERSION}0
+fi
+MAGICKPP_LIB_VERSION=${MAGICKPP_LIB_VERSION}${MAGICKPP_LIBRARY_REVISION}
+AC_SUBST(MAGICKPP_LIB_VERSION)
+
+# Definition used to define MagickLibVersionText in version.h
+MAGICKPP_LIB_VERSION_TEXT="${PACKAGE_VERSION}"
+AC_SUBST(MAGICKPP_LIB_VERSION_TEXT)
+
+# Definition used to define MagickLibVersionNumber in version.h
+MAGICK_LIB_VERSION_NUMBER="${MAGICK_LIBRARY_CURRENT},${MAGICK_LIBRARY_AGE},${MAGICK_LIBRARY_REVISION}"
+AC_SUBST(MAGICK_LIB_VERSION_NUMBER)
+
+
+
 # Regenerate config.status if ChangeLog or version.sh is updated.
 AC_SUBST([CONFIG_STATUS_DEPENDENCIES],['$(top_srcdir)/version.sh'])
 

magick/version.h

@@ -27,14 +27,19 @@ extern "C" {
 */
 #define MagickPackageName "ImageMagick"
 #define MagickCopyright  "Copyright (C) 1999-2013 ImageMagick Studio LLC"
-#define MagickSVNRevision  "12682:12685M"
+#define MagickSVNRevision  "12682:12692M"
 #define MagickLibVersion  0x686
 #define MagickLibVersionText  "6.8.6"
 #define MagickLibVersionNumber  1,0,0
 #define MagickLibAddendum  "-6"
 #define MagickLibInterface  1
 #define MagickLibMinInterface  1
-#define MagickReleaseDate  "2013-07-12"
+#define MagickppLibVersionText  "6.8.6"
+#define MagickppLibVersionNumber  @MAGICKPP_LIB_VERSION_NUMBER@
+#define MagickppLibAddendum  "-6"
+#define MagickppLibInterface  2
+#define MagickppLibMinInterface  2
+#define MagickReleaseDate  "2013-07-14"
 #define MagickChangeDate   "20130715"
 #define MagickFeatures "DPC OpenMP"
 #define MagickDelegates "bzlib djvu fftw fontconfig freetype jng jp2 jpeg lcms lzma openexr pango png ps tiff x xml zlib"

magick/version.h.in

@@ -34,6 +34,11 @@ extern "C" {
 #define MagickLibAddendum  "@PACKAGE_VERSION_ADDENDUM@"
 #define MagickLibInterface  @MAGICK_LIBRARY_CURRENT@
 #define MagickLibMinInterface  @MAGICK_LIBRARY_CURRENT_MIN@
+#define MagickppLibVersionText  "@MAGICKPP_LIB_VERSION_TEXT@"
+#define MagickppLibVersionNumber  @MAGICKPP_LIB_VERSION_NUMBER@
+#define MagickppLibAddendum  "@PACKAGE_VERSION_ADDENDUM@"
+#define MagickppLibInterface  @MAGICKPP_LIBRARY_CURRENT@
+#define MagickppLibMinInterface  @MAGICKPP_LIBRARY_CURRENT_MIN@
 #define MagickReleaseDate  "@PACKAGE_RELEASE_DATE@"
 #define MagickChangeDate   "@PACKAGE_CHANGE_DATE@"
 #define MagickFeatures "@MAGICK_FEATURES@"

version.sh

@@ -42,3 +42,8 @@ PACKAGE_VERSION_ADDENDUM="-${PACKAGE_RELEASE}"
 MAGICK_LIBRARY_CURRENT=1
 MAGICK_LIBRARY_REVISION=0
 MAGICK_LIBRARY_AGE=0
+
+# magick++
+MAGICKPP_LIBRARY_CURRENT=2
+MAGICKPP_LIBRARY_REVISION=0
+MAGICKPP_LIBRARY_AGE=0