diff --git a/Makefile.am b/Makefile.am
index 2632156..9d1af78 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -39,7 +39,9 @@
$(WAND_CLEANFILES) \
$(MAGICKPP_CLEANFILES) \
$(UTILITIES_CLEANFILES) \
- $(TESTS_CLEANFILES)
+ $(TESTS_CLEANFILES) \
+ magick/wizard-config.h \
+ _configs.sed
bin_PROGRAMS = \
$(UTILITIES_PGMS)
@@ -278,30 +280,31 @@
# Build Windows source Zip and 7Zip balls
#
if ZIP_DELEGATE
-DIST_WINDOWS_SRC_ZIP=$(PACKAGE_NAME)-$(PACKAGE_VERSION)$(PACKAGE_LIB_SUBVERSION)-windows.zip
+DIST_WINDOWS_SRC_ZIP=$(PACKAGE_NAME)-$(PACKAGE_VERSION)$(PACKAGE_VERSION_ADDENDUM)-windows.zip
else
DIST_WINDOWS_SRC_ZIP=
endif
if P7ZIP_DELEGATE
-DIST_WINDOWS_SRC_7ZIP=$(PACKAGE_NAME)-$(PACKAGE_VERSION)$(PACKAGE_LIB_SUBVERSION)-windows.7z
+DIST_WINDOWS_SRC_7ZIP=$(PACKAGE_NAME)-$(PACKAGE_VERSION)$(PACKAGE_VERSION_ADDENDUM)-windows.7z
else
DIST_WINDOWS_SRC_7ZIP=
endif
$(DIST_WINDOWS_SRC_ZIP) $(DIST_WINDOWS_SRC_7ZIP) windows-dist:
- if test -d $(PACKAGE_NAME)-$(PACKAGE_VERSION)$(PACKAGE_LIB_SUBVERSION) ; then \
- chmod -R u+w $(PACKAGE_NAME)-$(PACKAGE_VERSION)$(PACKAGE_LIB_SUBVERSION) ; \
- rm -rf $(PACKAGE_NAME)-$(PACKAGE_VERSION)$(PACKAGE_LIB_SUBVERSION) ; \
+ if test -d $(PACKAGE_NAME)-$(PACKAGE_VERSION)$(PACKAGE_VERSION_ADDENDUM) ; then \
+ chmod -R u+w $(PACKAGE_NAME)-$(PACKAGE_VERSION)$(PACKAGE_VERSION_ADDENDUM) ; \
+ rm -rf $(PACKAGE_NAME)-$(PACKAGE_VERSION)$(PACKAGE_VERSION_ADDENDUM) ; \
fi
+ svn export https://subversion.imagemagick.org/subversion/ImageMagick-Windows/trunk $(PACKAGE_NAME)-$(PACKAGE_VERSION)$(PACKAGE_VERSION_ADDENDUM)
if ZIP_DELEGATE
rm -f $(DIST_WINDOWS_SRC_ZIP)
- $(ZIP) -r -9 -q $(DIST_WINDOWS_SRC_ZIP) $(PACKAGE_NAME)-$(PACKAGE_VERSION)$(PACKAGE_LIB_SUBVERSION)
+ $(ZIP) -r -9 -q $(DIST_WINDOWS_SRC_ZIP) $(PACKAGE_NAME)-$(PACKAGE_VERSION)$(PACKAGE_VERSION_ADDENDUM)
endif # ZIP_DELEGATE
if P7ZIP_DELEGATE
rm -f $(DIST_WINDOWS_SRC_7ZIP)
- $(P7ZIP) a -t7z -mx=9 $(DIST_WINDOWS_SRC_7ZIP) $(PACKAGE_NAME)-$(PACKAGE_VERSION)$(PACKAGE_LIB_SUBVERSION)
+ $(P7ZIP) a -t7z -mx=9 $(DIST_WINDOWS_SRC_7ZIP) $(PACKAGE_NAME)-$(PACKAGE_VERSION)$(PACKAGE_VERSION_ADDENDUM)
chmod 644 $(DIST_WINDOWS_SRC_7ZIP)
endif # P7ZIP_DELEGATE
- rm -rf $(PACKAGE_NAME)-$(PACKAGE_VERSION)$(PACKAGE_LIB_SUBVERSION)
+ rm -rf $(PACKAGE_NAME)-$(PACKAGE_VERSION)$(PACKAGE_VERSION_ADDENDUM)
#
# RPM build support
@@ -321,11 +324,11 @@
RPMARCH=i386
DIST_ARCHIVE_RPM= \
- $(RPMDIR)/$(RPMARCH)/$(PACKAGE_NAME)-$(PACKAGE_VERSION)$(PACKAGE_LIB_SUBVERSION)-$(PACKAGE_RELEASE).$(RPMARCH).rpm \
- $(RPMDIR)/$(RPMARCH)/$(PACKAGE_NAME)-c++-$(PACKAGE_VERSION)$(PACKAGE_LIB_SUBVERSION)-$(PACKAGE_RELEASE).$(RPMARCH).rpm \
- $(RPMDIR)/$(RPMARCH)/$(PACKAGE_NAME)-c++-devel-$(PACKAGE_VERSION)$(PACKAGE_LIB_SUBVERSION)-$(PACKAGE_RELEASE).$(RPMARCH).rpm \
- $(RPMDIR)/$(RPMARCH)/$(PACKAGE_NAME)-devel-$(PACKAGE_VERSION)$(PACKAGE_LIB_SUBVERSION)-$(PACKAGE_RELEASE).$(RPMARCH).rpm \
- $(RPMDIR)/$(RPMARCH)/$(PACKAGE_NAME)-perl-$(PACKAGE_VERSION)$(PACKAGE_LIB_SUBVERSION)-$(PACKAGE_RELEASE).$(RPMARCH).rpm
+ $(RPMDIR)/$(RPMARCH)/$(PACKAGE_NAME)-$(PACKAGE_VERSION)$(PACKAGE_VERSION_ADDENDUM)-$(PACKAGE_RELEASE).$(RPMARCH).rpm \
+ $(RPMDIR)/$(RPMARCH)/$(PACKAGE_NAME)-c++-$(PACKAGE_VERSION)$(PACKAGE_VERSION_ADDENDUM)-$(PACKAGE_RELEASE).$(RPMARCH).rpm \
+ $(RPMDIR)/$(RPMARCH)/$(PACKAGE_NAME)-c++-devel-$(PACKAGE_VERSION)$(PACKAGE_VERSION_ADDENDUM)-$(PACKAGE_RELEASE).$(RPMARCH).rpm \
+ $(RPMDIR)/$(RPMARCH)/$(PACKAGE_NAME)-devel-$(PACKAGE_VERSION)$(PACKAGE_VERSION_ADDENDUM)-$(PACKAGE_RELEASE).$(RPMARCH).rpm \
+ $(RPMDIR)/$(RPMARCH)/$(PACKAGE_NAME)-perl-$(PACKAGE_VERSION)$(PACKAGE_VERSION_ADDENDUM)-$(PACKAGE_RELEASE).$(RPMARCH).rpm
.PHONY: rpm
rpm:
diff --git a/Makefile.in b/Makefile.in
index 286eb03..1eeb6ae 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -2382,7 +2382,6 @@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_CHANGE_DATE = @PACKAGE_CHANGE_DATE@
-PACKAGE_LIB_SUBVERSION = @PACKAGE_LIB_SUBVERSION@
PACKAGE_LIB_VERSION = @PACKAGE_LIB_VERSION@
PACKAGE_LIB_VERSION_NUMBER = @PACKAGE_LIB_VERSION_NUMBER@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -2392,6 +2391,7 @@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
+PACKAGE_VERSION_ADDENDUM = @PACKAGE_VERSION_ADDENDUM@
PATH_SEPARATOR = @PATH_SEPARATOR@
PCLCMYKDevice = @PCLCMYKDevice@
PCLColorDevice = @PCLColorDevice@
@@ -2553,8 +2553,9 @@
DISTCHECK_CONFIGURE_FLAGS = $(DISTCHECK_CONFIG_FLAGS)
CLEANFILES = $(LTDL_CLEANFILES) $(WAND_CLEANFILES) \
$(MAGICKPP_CLEANFILES) $(UTILITIES_CLEANFILES) \
- $(TESTS_CLEANFILES) ltdl/libltdl.la ltdl/libltdlc.la \
- ltdl/libdlloader.la $(ltdl_LIBOBJS) $(ltdl_LTLIBOBJS)
+ $(TESTS_CLEANFILES) magick/wizard-config.h _configs.sed \
+ ltdl/libltdl.la ltdl/libltdlc.la ltdl/libdlloader.la \
+ $(ltdl_LIBOBJS) $(ltdl_LTLIBOBJS)
# Binary scripts
bin_SCRIPTS = \
@@ -4595,9 +4596,9 @@
#
# Build Windows source Zip and 7Zip balls
#
-@ZIP_DELEGATE_TRUE@DIST_WINDOWS_SRC_ZIP = $(PACKAGE_NAME)-$(PACKAGE_VERSION)$(PACKAGE_LIB_SUBVERSION)-windows.zip
+@ZIP_DELEGATE_TRUE@DIST_WINDOWS_SRC_ZIP = $(PACKAGE_NAME)-$(PACKAGE_VERSION)$(PACKAGE_VERSION_ADDENDUM)-windows.zip
@P7ZIP_DELEGATE_FALSE@DIST_WINDOWS_SRC_7ZIP =
-@P7ZIP_DELEGATE_TRUE@DIST_WINDOWS_SRC_7ZIP = $(PACKAGE_NAME)-$(PACKAGE_VERSION)$(PACKAGE_LIB_SUBVERSION)-windows.7z
+@P7ZIP_DELEGATE_TRUE@DIST_WINDOWS_SRC_7ZIP = $(PACKAGE_NAME)-$(PACKAGE_VERSION)$(PACKAGE_VERSION_ADDENDUM)-windows.7z
#
# RPM build support
@@ -4607,11 +4608,11 @@
@RPM_DELEGATE_TRUE@RPMARCH = i386
@RPM_DELEGATE_FALSE@DIST_ARCHIVE_RPM =
@RPM_DELEGATE_TRUE@DIST_ARCHIVE_RPM = \
-@RPM_DELEGATE_TRUE@ $(RPMDIR)/$(RPMARCH)/$(PACKAGE_NAME)-$(PACKAGE_VERSION)$(PACKAGE_LIB_SUBVERSION)-$(PACKAGE_RELEASE).$(RPMARCH).rpm \
-@RPM_DELEGATE_TRUE@ $(RPMDIR)/$(RPMARCH)/$(PACKAGE_NAME)-c++-$(PACKAGE_VERSION)$(PACKAGE_LIB_SUBVERSION)-$(PACKAGE_RELEASE).$(RPMARCH).rpm \
-@RPM_DELEGATE_TRUE@ $(RPMDIR)/$(RPMARCH)/$(PACKAGE_NAME)-c++-devel-$(PACKAGE_VERSION)$(PACKAGE_LIB_SUBVERSION)-$(PACKAGE_RELEASE).$(RPMARCH).rpm \
-@RPM_DELEGATE_TRUE@ $(RPMDIR)/$(RPMARCH)/$(PACKAGE_NAME)-devel-$(PACKAGE_VERSION)$(PACKAGE_LIB_SUBVERSION)-$(PACKAGE_RELEASE).$(RPMARCH).rpm \
-@RPM_DELEGATE_TRUE@ $(RPMDIR)/$(RPMARCH)/$(PACKAGE_NAME)-perl-$(PACKAGE_VERSION)$(PACKAGE_LIB_SUBVERSION)-$(PACKAGE_RELEASE).$(RPMARCH).rpm
+@RPM_DELEGATE_TRUE@ $(RPMDIR)/$(RPMARCH)/$(PACKAGE_NAME)-$(PACKAGE_VERSION)$(PACKAGE_VERSION_ADDENDUM)-$(PACKAGE_RELEASE).$(RPMARCH).rpm \
+@RPM_DELEGATE_TRUE@ $(RPMDIR)/$(RPMARCH)/$(PACKAGE_NAME)-c++-$(PACKAGE_VERSION)$(PACKAGE_VERSION_ADDENDUM)-$(PACKAGE_RELEASE).$(RPMARCH).rpm \
+@RPM_DELEGATE_TRUE@ $(RPMDIR)/$(RPMARCH)/$(PACKAGE_NAME)-c++-devel-$(PACKAGE_VERSION)$(PACKAGE_VERSION_ADDENDUM)-$(PACKAGE_RELEASE).$(RPMARCH).rpm \
+@RPM_DELEGATE_TRUE@ $(RPMDIR)/$(RPMARCH)/$(PACKAGE_NAME)-devel-$(PACKAGE_VERSION)$(PACKAGE_VERSION_ADDENDUM)-$(PACKAGE_RELEASE).$(RPMARCH).rpm \
+@RPM_DELEGATE_TRUE@ $(RPMDIR)/$(RPMARCH)/$(PACKAGE_NAME)-perl-$(PACKAGE_VERSION)$(PACKAGE_VERSION_ADDENDUM)-$(PACKAGE_RELEASE).$(RPMARCH).rpm
all: $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) all-am
@@ -11167,16 +11168,17 @@
doxygen config/MagickCore.dox
doxygen config/MagickWand.dox
$(DIST_WINDOWS_SRC_ZIP) $(DIST_WINDOWS_SRC_7ZIP) windows-dist:
- if test -d $(PACKAGE_NAME)-$(PACKAGE_VERSION)$(PACKAGE_LIB_SUBVERSION) ; then \
- chmod -R u+w $(PACKAGE_NAME)-$(PACKAGE_VERSION)$(PACKAGE_LIB_SUBVERSION) ; \
- rm -rf $(PACKAGE_NAME)-$(PACKAGE_VERSION)$(PACKAGE_LIB_SUBVERSION) ; \
+ if test -d $(PACKAGE_NAME)-$(PACKAGE_VERSION)$(PACKAGE_VERSION_ADDENDUM) ; then \
+ chmod -R u+w $(PACKAGE_NAME)-$(PACKAGE_VERSION)$(PACKAGE_VERSION_ADDENDUM) ; \
+ rm -rf $(PACKAGE_NAME)-$(PACKAGE_VERSION)$(PACKAGE_VERSION_ADDENDUM) ; \
fi
+ svn export https://subversion.imagemagick.org/subversion/ImageMagick-Windows/trunk $(PACKAGE_NAME)-$(PACKAGE_VERSION)$(PACKAGE_VERSION_ADDENDUM)
@ZIP_DELEGATE_TRUE@ rm -f $(DIST_WINDOWS_SRC_ZIP)
-@ZIP_DELEGATE_TRUE@ $(ZIP) -r -9 -q $(DIST_WINDOWS_SRC_ZIP) $(PACKAGE_NAME)-$(PACKAGE_VERSION)$(PACKAGE_LIB_SUBVERSION)
+@ZIP_DELEGATE_TRUE@ $(ZIP) -r -9 -q $(DIST_WINDOWS_SRC_ZIP) $(PACKAGE_NAME)-$(PACKAGE_VERSION)$(PACKAGE_VERSION_ADDENDUM)
@P7ZIP_DELEGATE_TRUE@ rm -f $(DIST_WINDOWS_SRC_7ZIP)
-@P7ZIP_DELEGATE_TRUE@ $(P7ZIP) a -t7z -mx=9 $(DIST_WINDOWS_SRC_7ZIP) $(PACKAGE_NAME)-$(PACKAGE_VERSION)$(PACKAGE_LIB_SUBVERSION)
+@P7ZIP_DELEGATE_TRUE@ $(P7ZIP) a -t7z -mx=9 $(DIST_WINDOWS_SRC_7ZIP) $(PACKAGE_NAME)-$(PACKAGE_VERSION)$(PACKAGE_VERSION_ADDENDUM)
@P7ZIP_DELEGATE_TRUE@ chmod 644 $(DIST_WINDOWS_SRC_7ZIP)
- rm -rf $(PACKAGE_NAME)-$(PACKAGE_VERSION)$(PACKAGE_LIB_SUBVERSION)
+ rm -rf $(PACKAGE_NAME)-$(PACKAGE_VERSION)$(PACKAGE_VERSION_ADDENDUM)
@RPM_DELEGATE_TRUE@.PHONY: srpm
@RPM_DELEGATE_TRUE@$(DIST_ARCHIVE_SRPM) srpm: dist-bzip2
@RPM_DELEGATE_TRUE@ rm -f $(DIST_ARCHIVE_SRPM)
diff --git a/PerlMagick/Magick.xs b/PerlMagick/Magick.xs
index c473c4b..5f603d1 100644
--- a/PerlMagick/Magick.xs
+++ b/PerlMagick/Magick.xs
@@ -9478,7 +9478,6 @@
if ((attribute_flag[2] != 0) &&
(argument_list[2].long_reference != 0))
(void) SetImageArtifact(image,"identify:unique","true");
- (void) FloodfillPaintImage(image,channel,draw_info,&target,geometry.x,
(void) IdentifyImage(image,argument_list[0].file_reference,
MagickTrue);
break;
diff --git a/config/configure.xml b/config/configure.xml
index e14d71f..632d4c8 100644
--- a/config/configure.xml
+++ b/config/configure.xml
@@ -9,7 +9,7 @@
<configure name="NAME" value="ImageMagick"/>
<configure name="LIB_VERSION" value="0x659"/>
<configure name="LIB_VERSION_NUMBER" value="6,5,9,1"/>
- <configure name="RELEASE_DATE" value="2010-01-30"/>
+ <configure name="RELEASE_DATE" value="2010-01-31"/>
<configure name="CONFIGURE" value="./configure "/>
<configure name="PREFIX" value="/usr/local"/>
<configure name="EXEC-PREFIX" value="/usr/local"/>
diff --git a/configure b/configure
index fd291ab..75eae3b 100755
--- a/configure
+++ b/configure
@@ -1116,7 +1116,7 @@
INSTALL_DATA
INSTALL_SCRIPT
INSTALL_PROGRAM
-PACKAGE_LIB_SUBVERSION
+PACKAGE_VERSION_ADDENDUM
PACKAGE_RELEASE_DATE
PACKAGE_LIB_VERSION_NUMBER
PACKAGE_LIB_VERSION
@@ -3360,7 +3360,7 @@
# Source file containing package/library versioning information.
. ${srcdir}/version.sh
-echo "configuring ${PACKAGE_NAME} ${PACKAGE_VERSION}${PACKAGE_LIB_SUBVERSION}"
+echo "configuring ${PACKAGE_NAME} ${PACKAGE_VERSION}${PACKAGE_VERSION_ADDENDUM}"
# Make sure we can run config.sub.
$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
@@ -3915,7 +3915,7 @@
# Define the identity of the package.
PACKAGE=$PACKAGE_NAME
- VERSION="${PACKAGE_VERSION}${PACKAGE_LIB_SUBVERSION}"
+ VERSION="${PACKAGE_VERSION}${PACKAGE_VERSION_ADDENDUM}"
# Some tools Automake needs.
diff --git a/configure.ac b/configure.ac
index 25c8cd1..2baebfc 100755
--- a/configure.ac
+++ b/configure.ac
@@ -82,7 +82,7 @@
# Source file containing package/library versioning information.
. ${srcdir}/version.sh
-echo "configuring ${PACKAGE_NAME} ${PACKAGE_VERSION}${PACKAGE_LIB_SUBVERSION}"
+echo "configuring ${PACKAGE_NAME} ${PACKAGE_VERSION}${PACKAGE_VERSION_ADDENDUM}"
AC_CANONICAL_BUILD
AC_CANONICAL_HOST
AC_CANONICAL_TARGET([])
@@ -99,12 +99,12 @@
AC_SUBST(PACKAGE_LIB_VERSION)dnl
AC_SUBST(PACKAGE_LIB_VERSION_NUMBER)dnl
AC_SUBST(PACKAGE_RELEASE_DATE)dnl
-AC_SUBST(PACKAGE_LIB_SUBVERSION)dnl
+AC_SUBST(PACKAGE_VERSION_ADDENDUM)dnl
# Ensure that make can run correctly
AM_SANITY_CHECK
-AM_INIT_AUTOMAKE($PACKAGE_NAME,"${PACKAGE_VERSION}${PACKAGE_LIB_SUBVERSION}", ' ')
+AM_INIT_AUTOMAKE($PACKAGE_NAME,"${PACKAGE_VERSION}${PACKAGE_VERSION_ADDENDUM}", ' ')
# Enable support for silent build rules
AM_SILENT_RULES([yes])
diff --git a/magick/identify.c b/magick/identify.c
index 0810261..7e9a6f3 100644
--- a/magick/identify.c
+++ b/magick/identify.c
@@ -409,20 +409,27 @@
(void) fprintf(file," Colorspace: %s\n",MagickOptionToMnemonic(
MagickColorspaceOptions,(long) image->colorspace));
channel_statistics=(ChannelStatistics *) NULL;
+ channel_features=(ChannelFeatures *) NULL;
+ colorspace=image->colorspace;
if (ping == MagickFalse)
- channel_statistics=GetImageChannelStatistics(image,&image->exception);
- if (channel_statistics != (ChannelStatistics *) NULL)
{
unsigned long
depth;
+ channel_statistics=GetImageChannelStatistics(image,&image->exception);
+ artifact=GetImageArtifact(image,"identify:features");
+ if (artifact != (const char *) NULL)
+ {
+ distance=StringToUnsignedLong(artifact);
+ channel_features=GetImageChannelFeatures(image,distance,
+ &image->exception);
+ }
depth=GetImageDepth(image,&image->exception);
if (image->depth == depth)
(void) fprintf(file," Depth: %lu-bit\n",image->depth);
else
(void) fprintf(file," Depth: %lu/%lu-bit\n",image->depth,depth);
(void) fprintf(file," Channel depth:\n");
- colorspace=image->colorspace;
if (IsGrayImage(image,&image->exception) != MagickFalse)
colorspace=GRAYColorspace;
switch (colorspace)
@@ -470,6 +477,9 @@
if (image->depth <= MAGICKCORE_QUANTUM_DEPTH)
scale=QuantumRange/((unsigned long) QuantumRange >> ((unsigned long)
MAGICKCORE_QUANTUM_DEPTH-image->depth));
+ }
+ if (channel_statistics != (ChannelStatistics *) NULL)
+ {
(void) fprintf(file," Channel statistics:\n");
switch (colorspace)
{
@@ -515,14 +525,6 @@
channel_statistics=(ChannelStatistics *) RelinquishMagickMemory(
channel_statistics);
}
- channel_features=(ChannelFeatures *) NULL;
- artifact=GetImageArtifact(image,"identify:features");
- if ((ping == MagickFalse) && (artifact != (const char *) NULL))
- {
- distance=StringToUnsignedLong(artifact);
- channel_features=GetImageChannelFeatures(image,distance,
- &image->exception);
- }
if (channel_features != (ChannelFeatures *) NULL)
{
(void) fprintf(file," Channel features (horizontal, vertical, left and right diagonals, average):\n");
diff --git a/magick/version.h b/magick/version.h
index 2ea88b4..fe5bf8f 100644
--- a/magick/version.h
+++ b/magick/version.h
@@ -30,9 +30,9 @@
#define MagickLibVersion 0x659
#define MagickLibVersionText "6.5.9"
#define MagickLibVersionNumber 3,0,0
-#define MagickLibSubversion "-1"
+#define MagickLibAddendum "-1"
#define MagickLibInterface 3
-#define MagickReleaseDate "2010-01-30"
+#define MagickReleaseDate "2010-01-31"
#define MagickChangeDate "20100127"
#define MagickAuthoritativeURL "http://www.imagemagick.org"
#define MagickHomeURL "file:///usr/local/share/doc/ImageMagick-6.5.9/index.html"
@@ -70,7 +70,7 @@
#define MagickFeatures \
MagickHDRIFeature MagickOPENMPFeature MagickOPENCLFeature
#define MagickVersion \
- MagickPackageName " " MagickLibVersionText MagickLibSubversion " " \
+ MagickPackageName " " MagickLibVersionText MagickLibAddendum " " \
MagickReleaseDate " " MagickQuantumDepth " " MagickAuthoritativeURL
extern MagickExport char
diff --git a/magick/version.h.in b/magick/version.h.in
index 76c6029..806056d 100644
--- a/magick/version.h.in
+++ b/magick/version.h.in
@@ -30,7 +30,7 @@
#define MagickLibVersion @PACKAGE_LIB_VERSION@
#define MagickLibVersionText "@MAGICK_LIB_VERSION_TEXT@"
#define MagickLibVersionNumber @MAGICK_LIB_VERSION_NUMBER@
-#define MagickLibSubversion "@PACKAGE_LIB_SUBVERSION@"
+#define MagickLibAddendum "@PACKAGE_VERSION_ADDENDUM@"
#define MagickLibInterface @MAGICK_LIBRARY_CURRENT@
#define MagickReleaseDate "@PACKAGE_RELEASE_DATE@"
#define MagickChangeDate "@PACKAGE_CHANGE_DATE@"
@@ -70,7 +70,7 @@
#define MagickFeatures \
MagickHDRIFeature MagickOPENMPFeature MagickOPENCLFeature
#define MagickVersion \
- MagickPackageName " " MagickLibVersionText MagickLibSubversion " " \
+ MagickPackageName " " MagickLibVersionText MagickLibAddendum " " \
MagickReleaseDate " " MagickQuantumDepth " " MagickAuthoritativeURL
extern MagickExport char
diff --git a/tests/validate.h b/tests/validate.h
index 9d9f998..fec9ab5 100644
--- a/tests/validate.h
+++ b/tests/validate.h
@@ -278,12 +278,10 @@
{ "JPG", UndefinedCompression, 0.003 },
{ "K25", UndefinedCompression, 0.0 },
{ "KDC", UndefinedCompression, 0.0 },
- { "MAT", UndefinedCompression, 0.0 },
{ "MATTE", UndefinedCompression, 0.0 },
{ "MIFF", UndefinedCompression, 0.0 },
{ "MNG", UndefinedCompression, 0.0 },
{ "MONO", UndefinedCompression, 0.0 },
- { "MOV", UndefinedCompression, 0.0 },
{ "MRW", UndefinedCompression, 0.0 },
{ "MTV", UndefinedCompression, 0.0 },
{ "NEF", UndefinedCompression, 0.0 },
diff --git a/version.sh b/version.sh
index 9d4afeb..18fc510 100644
--- a/version.sh
+++ b/version.sh
@@ -25,7 +25,7 @@
#
# Package version addendum. This is an arbitrary suffix (if any) appended
# to the package version. (e.g. "beta1")
-PACKAGE_LIB_SUBVERSION="-${PACKAGE_RELEASE}"
+PACKAGE_VERSION_ADDENDUM="-${PACKAGE_RELEASE}"
#
# Libtool library revision control info: See the libtool documentation under