(no commit message)

diff --git a/Magick++/tests/Makefile.am b/Magick++/tests/Makefile.am
index 56f7e8a84883c451faebbfe01551e32caac1534c..82048401fabb3bb1f8c2281b2317a5c882a3acf6 100644 (file)
--- a/Magick++/tests/Makefile.am
+++ b/Magick++/tests/Makefile.am
@@ -55,17 +55,7 @@ TESTS_ENVIRONMENT = \
 
 # Tests to run
 TESTS = \
-       test_exceptions.sh \
-       test_appendImages.sh \
-       test_attributes.sh \
-       test_averageImages.sh \
-       test_coalesceImages.sh \
-       test_colorHistogram.sh \
-       test_color.sh \
-       test_montageImages.sh \
-       test_morphImages.sh \
-       test_readWriteBlob.sh \
-       test_readWriteImages.sh
+       tests.tap \
 
 # Tests which are expected to fail
 XFAIL_TESTS =

diff --git a/Magick++/tests/appendImages.sh b/Magick++/tests/appendImages.sh
deleted file mode 100755 (executable)
index 0d242a9..0000000
--- a/Magick++/tests/appendImages.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/sh
-#
-# Copyright 2004 Bob Friesenhahn <bfriesen@simple.dallas.tx.us>
-#
-# This file is part of Magick++, the C++ API for ImageMagick and
-# ImageMagick.  Please see the file "COPYING" included with Magick++
-# for usage and copying restrictions.
-#
-
-SRCDIR=`dirname $0`
-SRCDIR=`cd $SRCDIR; pwd`/
-export SRCDIR
-cd Magick++/tests || exit 1
-
-executable=`echo $0 | sed -e 's:.*/::g;s:test_::;s:\.sh::'`
-
-outfile="test_${executable}.out"
-
-rm -f $outfile
-${MEMCHECK} "./${executable}" 2>&1 > $outfile
-status=$?
-if test $status -eq 1
-then
-  cat $outfile
-fi
-rm -f $outfile
-exit $status
-
-

diff --git a/Magick++/tests/attributes.sh b/Magick++/tests/attributes.sh
deleted file mode 100755 (executable)
index 0d242a9..0000000
--- a/Magick++/tests/attributes.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/sh
-#
-# Copyright 2004 Bob Friesenhahn <bfriesen@simple.dallas.tx.us>
-#
-# This file is part of Magick++, the C++ API for ImageMagick and
-# ImageMagick.  Please see the file "COPYING" included with Magick++
-# for usage and copying restrictions.
-#
-
-SRCDIR=`dirname $0`
-SRCDIR=`cd $SRCDIR; pwd`/
-export SRCDIR
-cd Magick++/tests || exit 1
-
-executable=`echo $0 | sed -e 's:.*/::g;s:test_::;s:\.sh::'`
-
-outfile="test_${executable}.out"
-
-rm -f $outfile
-${MEMCHECK} "./${executable}" 2>&1 > $outfile
-status=$?
-if test $status -eq 1
-then
-  cat $outfile
-fi
-rm -f $outfile
-exit $status
-
-

diff --git a/Magick++/tests/averageImages.sh b/Magick++/tests/averageImages.sh
deleted file mode 100755 (executable)
index 0d242a9..0000000
--- a/Magick++/tests/averageImages.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/sh
-#
-# Copyright 2004 Bob Friesenhahn <bfriesen@simple.dallas.tx.us>
-#
-# This file is part of Magick++, the C++ API for ImageMagick and
-# ImageMagick.  Please see the file "COPYING" included with Magick++
-# for usage and copying restrictions.
-#
-
-SRCDIR=`dirname $0`
-SRCDIR=`cd $SRCDIR; pwd`/
-export SRCDIR
-cd Magick++/tests || exit 1
-
-executable=`echo $0 | sed -e 's:.*/::g;s:test_::;s:\.sh::'`
-
-outfile="test_${executable}.out"
-
-rm -f $outfile
-${MEMCHECK} "./${executable}" 2>&1 > $outfile
-status=$?
-if test $status -eq 1
-then
-  cat $outfile
-fi
-rm -f $outfile
-exit $status
-
-

diff --git a/Magick++/tests/coalesceImages.sh b/Magick++/tests/coalesceImages.sh
deleted file mode 100755 (executable)
index 0d242a9..0000000
--- a/Magick++/tests/coalesceImages.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/sh
-#
-# Copyright 2004 Bob Friesenhahn <bfriesen@simple.dallas.tx.us>
-#
-# This file is part of Magick++, the C++ API for ImageMagick and
-# ImageMagick.  Please see the file "COPYING" included with Magick++
-# for usage and copying restrictions.
-#
-
-SRCDIR=`dirname $0`
-SRCDIR=`cd $SRCDIR; pwd`/
-export SRCDIR
-cd Magick++/tests || exit 1
-
-executable=`echo $0 | sed -e 's:.*/::g;s:test_::;s:\.sh::'`
-
-outfile="test_${executable}.out"
-
-rm -f $outfile
-${MEMCHECK} "./${executable}" 2>&1 > $outfile
-status=$?
-if test $status -eq 1
-then
-  cat $outfile
-fi
-rm -f $outfile
-exit $status
-
-

diff --git a/Magick++/tests/coderInfo.sh b/Magick++/tests/coderInfo.sh
deleted file mode 100755 (executable)
index 0d242a9..0000000
--- a/Magick++/tests/coderInfo.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/sh
-#
-# Copyright 2004 Bob Friesenhahn <bfriesen@simple.dallas.tx.us>
-#
-# This file is part of Magick++, the C++ API for ImageMagick and
-# ImageMagick.  Please see the file "COPYING" included with Magick++
-# for usage and copying restrictions.
-#
-
-SRCDIR=`dirname $0`
-SRCDIR=`cd $SRCDIR; pwd`/
-export SRCDIR
-cd Magick++/tests || exit 1
-
-executable=`echo $0 | sed -e 's:.*/::g;s:test_::;s:\.sh::'`
-
-outfile="test_${executable}.out"
-
-rm -f $outfile
-${MEMCHECK} "./${executable}" 2>&1 > $outfile
-status=$?
-if test $status -eq 1
-then
-  cat $outfile
-fi
-rm -f $outfile
-exit $status
-
-

diff --git a/Magick++/tests/color.sh b/Magick++/tests/color.sh
deleted file mode 100755 (executable)
index 0d242a9..0000000
--- a/Magick++/tests/color.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/sh
-#
-# Copyright 2004 Bob Friesenhahn <bfriesen@simple.dallas.tx.us>
-#
-# This file is part of Magick++, the C++ API for ImageMagick and
-# ImageMagick.  Please see the file "COPYING" included with Magick++
-# for usage and copying restrictions.
-#
-
-SRCDIR=`dirname $0`
-SRCDIR=`cd $SRCDIR; pwd`/
-export SRCDIR
-cd Magick++/tests || exit 1
-
-executable=`echo $0 | sed -e 's:.*/::g;s:test_::;s:\.sh::'`
-
-outfile="test_${executable}.out"
-
-rm -f $outfile
-${MEMCHECK} "./${executable}" 2>&1 > $outfile
-status=$?
-if test $status -eq 1
-then
-  cat $outfile
-fi
-rm -f $outfile
-exit $status
-
-

diff --git a/Magick++/tests/colorHistogram.sh b/Magick++/tests/colorHistogram.sh
deleted file mode 100755 (executable)
index 0d242a9..0000000
--- a/Magick++/tests/colorHistogram.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/sh
-#
-# Copyright 2004 Bob Friesenhahn <bfriesen@simple.dallas.tx.us>
-#
-# This file is part of Magick++, the C++ API for ImageMagick and
-# ImageMagick.  Please see the file "COPYING" included with Magick++
-# for usage and copying restrictions.
-#
-
-SRCDIR=`dirname $0`
-SRCDIR=`cd $SRCDIR; pwd`/
-export SRCDIR
-cd Magick++/tests || exit 1
-
-executable=`echo $0 | sed -e 's:.*/::g;s:test_::;s:\.sh::'`
-
-outfile="test_${executable}.out"
-
-rm -f $outfile
-${MEMCHECK} "./${executable}" 2>&1 > $outfile
-status=$?
-if test $status -eq 1
-then
-  cat $outfile
-fi
-rm -f $outfile
-exit $status
-
-

diff --git a/Magick++/tests/exceptions.sh b/Magick++/tests/exceptions.sh
deleted file mode 100755 (executable)
index 0d242a9..0000000
--- a/Magick++/tests/exceptions.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/sh
-#
-# Copyright 2004 Bob Friesenhahn <bfriesen@simple.dallas.tx.us>
-#
-# This file is part of Magick++, the C++ API for ImageMagick and
-# ImageMagick.  Please see the file "COPYING" included with Magick++
-# for usage and copying restrictions.
-#
-
-SRCDIR=`dirname $0`
-SRCDIR=`cd $SRCDIR; pwd`/
-export SRCDIR
-cd Magick++/tests || exit 1
-
-executable=`echo $0 | sed -e 's:.*/::g;s:test_::;s:\.sh::'`
-
-outfile="test_${executable}.out"
-
-rm -f $outfile
-${MEMCHECK} "./${executable}" 2>&1 > $outfile
-status=$?
-if test $status -eq 1
-then
-  cat $outfile
-fi
-rm -f $outfile
-exit $status
-
-

diff --git a/Magick++/tests/montageImages.sh b/Magick++/tests/montageImages.sh
deleted file mode 100755 (executable)
index 0d242a9..0000000
--- a/Magick++/tests/montageImages.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/sh
-#
-# Copyright 2004 Bob Friesenhahn <bfriesen@simple.dallas.tx.us>
-#
-# This file is part of Magick++, the C++ API for ImageMagick and
-# ImageMagick.  Please see the file "COPYING" included with Magick++
-# for usage and copying restrictions.
-#
-
-SRCDIR=`dirname $0`
-SRCDIR=`cd $SRCDIR; pwd`/
-export SRCDIR
-cd Magick++/tests || exit 1
-
-executable=`echo $0 | sed -e 's:.*/::g;s:test_::;s:\.sh::'`
-
-outfile="test_${executable}.out"
-
-rm -f $outfile
-${MEMCHECK} "./${executable}" 2>&1 > $outfile
-status=$?
-if test $status -eq 1
-then
-  cat $outfile
-fi
-rm -f $outfile
-exit $status
-
-

diff --git a/Magick++/tests/morphImages.sh b/Magick++/tests/morphImages.sh
deleted file mode 100755 (executable)
index 0d242a9..0000000
--- a/Magick++/tests/morphImages.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/sh
-#
-# Copyright 2004 Bob Friesenhahn <bfriesen@simple.dallas.tx.us>
-#
-# This file is part of Magick++, the C++ API for ImageMagick and
-# ImageMagick.  Please see the file "COPYING" included with Magick++
-# for usage and copying restrictions.
-#
-
-SRCDIR=`dirname $0`
-SRCDIR=`cd $SRCDIR; pwd`/
-export SRCDIR
-cd Magick++/tests || exit 1
-
-executable=`echo $0 | sed -e 's:.*/::g;s:test_::;s:\.sh::'`
-
-outfile="test_${executable}.out"
-
-rm -f $outfile
-${MEMCHECK} "./${executable}" 2>&1 > $outfile
-status=$?
-if test $status -eq 1
-then
-  cat $outfile
-fi
-rm -f $outfile
-exit $status
-
-

diff --git a/Magick++/tests/readWriteBlob.sh b/Magick++/tests/readWriteBlob.sh
deleted file mode 100755 (executable)
index 0d242a9..0000000
--- a/Magick++/tests/readWriteBlob.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/sh
-#
-# Copyright 2004 Bob Friesenhahn <bfriesen@simple.dallas.tx.us>
-#
-# This file is part of Magick++, the C++ API for ImageMagick and
-# ImageMagick.  Please see the file "COPYING" included with Magick++
-# for usage and copying restrictions.
-#
-
-SRCDIR=`dirname $0`
-SRCDIR=`cd $SRCDIR; pwd`/
-export SRCDIR
-cd Magick++/tests || exit 1
-
-executable=`echo $0 | sed -e 's:.*/::g;s:test_::;s:\.sh::'`
-
-outfile="test_${executable}.out"
-
-rm -f $outfile
-${MEMCHECK} "./${executable}" 2>&1 > $outfile
-status=$?
-if test $status -eq 1
-then
-  cat $outfile
-fi
-rm -f $outfile
-exit $status
-
-

diff --git a/Magick++/tests/readWriteImages.sh b/Magick++/tests/readWriteImages.sh
deleted file mode 100755 (executable)
index 0d242a9..0000000
--- a/Magick++/tests/readWriteImages.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/sh
-#
-# Copyright 2004 Bob Friesenhahn <bfriesen@simple.dallas.tx.us>
-#
-# This file is part of Magick++, the C++ API for ImageMagick and
-# ImageMagick.  Please see the file "COPYING" included with Magick++
-# for usage and copying restrictions.
-#
-
-SRCDIR=`dirname $0`
-SRCDIR=`cd $SRCDIR; pwd`/
-export SRCDIR
-cd Magick++/tests || exit 1
-
-executable=`echo $0 | sed -e 's:.*/::g;s:test_::;s:\.sh::'`
-
-outfile="test_${executable}.out"
-
-rm -f $outfile
-${MEMCHECK} "./${executable}" 2>&1 > $outfile
-status=$?
-if test $status -eq 1
-then
-  cat $outfile
-fi
-rm -f $outfile
-exit $status
-
-

diff --git a/Magick++/tests/test_appendImages.sh b/Magick++/tests/test_appendImages.sh
deleted file mode 100755 (executable)
index 478b955..0000000
--- a/Magick++/tests/test_appendImages.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-#
-# Copyright 2004 Bob Friesenhahn <bfriesen@simple.dallas.tx.us>
-#
-executable=`echo $0 | sed -e 's:.*/::g;s:test_::;s:\.sh::'`
-
-outfile="test_${executable}.out"
-
-rm -f $outfile
-${MAGICK_ENV} ${MEMCHECK} "./${executable}" 2>&1 > $outfile
-status=$?
-if test $status -eq 1
-then
-  cat $outfile
-fi
-rm -f $outfile
-exit $status
-
-

diff --git a/Magick++/tests/test_attributes.sh b/Magick++/tests/test_attributes.sh
deleted file mode 100755 (executable)
index 478b955..0000000
--- a/Magick++/tests/test_attributes.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-#
-# Copyright 2004 Bob Friesenhahn <bfriesen@simple.dallas.tx.us>
-#
-executable=`echo $0 | sed -e 's:.*/::g;s:test_::;s:\.sh::'`
-
-outfile="test_${executable}.out"
-
-rm -f $outfile
-${MAGICK_ENV} ${MEMCHECK} "./${executable}" 2>&1 > $outfile
-status=$?
-if test $status -eq 1
-then
-  cat $outfile
-fi
-rm -f $outfile
-exit $status
-
-

diff --git a/Magick++/tests/test_averageImages.sh b/Magick++/tests/test_averageImages.sh
deleted file mode 100755 (executable)
index 0ecce2f..0000000
--- a/Magick++/tests/test_averageImages.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh 
-#
-# Copyright 2004 Bob Friesenhahn <bfriesen@simple.dallas.tx.us>
-#
-executable=`echo $0 | sed -e 's:.*/::g;s:test_::;s:\.sh::'`
-
-outfile="test_${executable}.out"
-
-rm -f $outfile
-${MAGICK_ENV} ${MEMCHECK} "./${executable}" 2>&1 > $outfile
-status=$?
-if test $status -eq 1
-then
-  cat $outfile
-fi
-rm -f $outfile
-exit $status
-
-

diff --git a/Magick++/tests/test_coalesceImages.sh b/Magick++/tests/test_coalesceImages.sh
deleted file mode 100755 (executable)
index 478b955..0000000
--- a/Magick++/tests/test_coalesceImages.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-#
-# Copyright 2004 Bob Friesenhahn <bfriesen@simple.dallas.tx.us>
-#
-executable=`echo $0 | sed -e 's:.*/::g;s:test_::;s:\.sh::'`
-
-outfile="test_${executable}.out"
-
-rm -f $outfile
-${MAGICK_ENV} ${MEMCHECK} "./${executable}" 2>&1 > $outfile
-status=$?
-if test $status -eq 1
-then
-  cat $outfile
-fi
-rm -f $outfile
-exit $status
-
-

diff --git a/Magick++/tests/test_coderInfo.sh b/Magick++/tests/test_coderInfo.sh
deleted file mode 100755 (executable)
index 478b955..0000000
--- a/Magick++/tests/test_coderInfo.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-#
-# Copyright 2004 Bob Friesenhahn <bfriesen@simple.dallas.tx.us>
-#
-executable=`echo $0 | sed -e 's:.*/::g;s:test_::;s:\.sh::'`
-
-outfile="test_${executable}.out"
-
-rm -f $outfile
-${MAGICK_ENV} ${MEMCHECK} "./${executable}" 2>&1 > $outfile
-status=$?
-if test $status -eq 1
-then
-  cat $outfile
-fi
-rm -f $outfile
-exit $status
-
-

diff --git a/Magick++/tests/test_color.sh b/Magick++/tests/test_color.sh
deleted file mode 100755 (executable)
index 478b955..0000000
--- a/Magick++/tests/test_color.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-#
-# Copyright 2004 Bob Friesenhahn <bfriesen@simple.dallas.tx.us>
-#
-executable=`echo $0 | sed -e 's:.*/::g;s:test_::;s:\.sh::'`
-
-outfile="test_${executable}.out"
-
-rm -f $outfile
-${MAGICK_ENV} ${MEMCHECK} "./${executable}" 2>&1 > $outfile
-status=$?
-if test $status -eq 1
-then
-  cat $outfile
-fi
-rm -f $outfile
-exit $status
-
-

diff --git a/Magick++/tests/test_colorHistogram.sh b/Magick++/tests/test_colorHistogram.sh
deleted file mode 100755 (executable)
index 478b955..0000000
--- a/Magick++/tests/test_colorHistogram.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-#
-# Copyright 2004 Bob Friesenhahn <bfriesen@simple.dallas.tx.us>
-#
-executable=`echo $0 | sed -e 's:.*/::g;s:test_::;s:\.sh::'`
-
-outfile="test_${executable}.out"
-
-rm -f $outfile
-${MAGICK_ENV} ${MEMCHECK} "./${executable}" 2>&1 > $outfile
-status=$?
-if test $status -eq 1
-then
-  cat $outfile
-fi
-rm -f $outfile
-exit $status
-
-

diff --git a/Magick++/tests/test_exceptions.sh b/Magick++/tests/test_exceptions.sh
deleted file mode 100755 (executable)
index 478b955..0000000
--- a/Magick++/tests/test_exceptions.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-#
-# Copyright 2004 Bob Friesenhahn <bfriesen@simple.dallas.tx.us>
-#
-executable=`echo $0 | sed -e 's:.*/::g;s:test_::;s:\.sh::'`
-
-outfile="test_${executable}.out"
-
-rm -f $outfile
-${MAGICK_ENV} ${MEMCHECK} "./${executable}" 2>&1 > $outfile
-status=$?
-if test $status -eq 1
-then
-  cat $outfile
-fi
-rm -f $outfile
-exit $status
-
-

diff --git a/Magick++/tests/test_montageImages.sh b/Magick++/tests/test_montageImages.sh
deleted file mode 100755 (executable)
index 478b955..0000000
--- a/Magick++/tests/test_montageImages.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-#
-# Copyright 2004 Bob Friesenhahn <bfriesen@simple.dallas.tx.us>
-#
-executable=`echo $0 | sed -e 's:.*/::g;s:test_::;s:\.sh::'`
-
-outfile="test_${executable}.out"
-
-rm -f $outfile
-${MAGICK_ENV} ${MEMCHECK} "./${executable}" 2>&1 > $outfile
-status=$?
-if test $status -eq 1
-then
-  cat $outfile
-fi
-rm -f $outfile
-exit $status
-
-

diff --git a/Magick++/tests/test_morphImages.sh b/Magick++/tests/test_morphImages.sh
deleted file mode 100755 (executable)
index 478b955..0000000
--- a/Magick++/tests/test_morphImages.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-#
-# Copyright 2004 Bob Friesenhahn <bfriesen@simple.dallas.tx.us>
-#
-executable=`echo $0 | sed -e 's:.*/::g;s:test_::;s:\.sh::'`
-
-outfile="test_${executable}.out"
-
-rm -f $outfile
-${MAGICK_ENV} ${MEMCHECK} "./${executable}" 2>&1 > $outfile
-status=$?
-if test $status -eq 1
-then
-  cat $outfile
-fi
-rm -f $outfile
-exit $status
-
-

diff --git a/Magick++/tests/test_readWriteBlob.sh b/Magick++/tests/test_readWriteBlob.sh
deleted file mode 100755 (executable)
index 478b955..0000000
--- a/Magick++/tests/test_readWriteBlob.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-#
-# Copyright 2004 Bob Friesenhahn <bfriesen@simple.dallas.tx.us>
-#
-executable=`echo $0 | sed -e 's:.*/::g;s:test_::;s:\.sh::'`
-
-outfile="test_${executable}.out"
-
-rm -f $outfile
-${MAGICK_ENV} ${MEMCHECK} "./${executable}" 2>&1 > $outfile
-status=$?
-if test $status -eq 1
-then
-  cat $outfile
-fi
-rm -f $outfile
-exit $status
-
-

diff --git a/Magick++/tests/test_readWriteImages.sh b/Magick++/tests/test_readWriteImages.sh
deleted file mode 100755 (executable)
index 478b955..0000000
--- a/Magick++/tests/test_readWriteImages.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-#
-# Copyright 2004 Bob Friesenhahn <bfriesen@simple.dallas.tx.us>
-#
-executable=`echo $0 | sed -e 's:.*/::g;s:test_::;s:\.sh::'`
-
-outfile="test_${executable}.out"
-
-rm -f $outfile
-${MAGICK_ENV} ${MEMCHECK} "./${executable}" 2>&1 > $outfile
-status=$?
-if test $status -eq 1
-then
-  cat $outfile
-fi
-rm -f $outfile
-exit $status
-
-

diff --git a/MagickCore/version.h b/MagickCore/version.h
index 8c1f8ab38b3e9a6ee977a19cc9a4a518827df13c..3c7a8a2fdf6e7214d8c9cf18750c57375a30f913 100644 (file)
--- 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  "9013:9029M"
+#define MagickSVNRevision  "9013:9032M"
 #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-08-20"
+#define MagickReleaseDate  "2012-08-21"
 #define MagickChangeDate   "20120808"
 #define MagickAuthoritativeURL  "http://www.imagemagick.org"
 #if defined(MAGICKCORE_OPENMP_SUPPORT)

diff --git a/MagickWand/Makefile.am b/MagickWand/Makefile.am
index a48111652b094187748f7420c030e541ea886140..cfe62120c644ed233afb35145c5598a52e763970 100644 (file)
--- a/MagickWand/Makefile.am
+++ b/MagickWand/Makefile.am
@@ -140,7 +140,7 @@ MAGICKWAND_EXTRA_DIST = \
        MagickWand/MagickWand-config.1 \
        MagickWand/MagickWand.pc.in \
        MagickWand/sequence.miff \
-       MagickWand/common.sh \
+       MagickWand/common.shi \
        $(MAGICKWAND_TESTS)
 
 MagickWand_drawtest_SOURCES      = MagickWand/drawtest.c
@@ -156,8 +156,8 @@ MAGICKWAND_CHECK_PGRMS = \
        MagickWand/wandtest
 
 MAGICKWAND_TESTS = \
-       MagickWand/drawtest.sh \
-       MagickWand/wandtest.sh
+       MagickWand/drawtest.tap \
+       MagickWand/wandtest.tap
 
 MAGICKWAND_CLEANFILES = \
        MagickWand/*_out.*

diff --git a/MagickWand/common.sh b/MagickWand/common.shi
similarity index 100%
rename from MagickWand/common.sh
rename to MagickWand/common.shi

diff --git a/MagickWand/drawtest.sh b/MagickWand/drawtest.tap
similarity index 71%
rename from MagickWand/drawtest.sh
rename to MagickWand/drawtest.tap
index 3629d334afd972a701bc483e630e115633ba8b29..486acf4b2e326e2ef3685e84430f9d3168b8bcaf 100755 (executable)
--- a/MagickWand/drawtest.sh
+++ b/MagickWand/drawtest.tap
@@ -7,6 +7,8 @@
 #
 
 set -e # Exit on any error
-. ${srcdir}/MagickWand/common.sh
+. ${srcdir}/MagickWand/common.shi
+echo "1..1"
 
-${MEMCHECK} ./drawtest drawtest_out.miff
+${MEMCHECK} ./drawtest drawtest_out.miff && echo "ok" || echo "not ok"
+:

diff --git a/MagickWand/wandtest.sh b/MagickWand/wandtest.tap
similarity index 78%
rename from MagickWand/wandtest.sh
rename to MagickWand/wandtest.tap
index f1dbc5f39734ad70d86a1e3fb12757ed70d5fdea..5d1d3c876c91832e3b0fcc7610778c8dd1e59366 100755 (executable)
--- a/MagickWand/wandtest.sh
+++ b/MagickWand/wandtest.tap
@@ -10,5 +10,7 @@
 
 set -e # Exit on any error
 . ${srcdir}/MagickWand/common.sh
+echo "1..1"
 
-${MEMCHECK} ./wandtest wandtest_out.miff
+${MEMCHECK} ./wandtest wandtest_out.miff -validate compare && echo "ok" || echo "not ok"
+:

diff --git a/Makefile.in b/Makefile.in
index 24939cbd10763fd48d20f921c882e18df34bde26..568a54f97b0ea16cb78ac77d9004a99ee0e787b1 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -4649,7 +4649,7 @@ MAGICKWAND_EXTRA_DIST = \
        MagickWand/MagickWand-config.1 \
        MagickWand/MagickWand.pc.in \
        MagickWand/sequence.miff \
-       MagickWand/common.sh \
+       MagickWand/common.shi \
        $(MAGICKWAND_TESTS)
 
 MagickWand_drawtest_SOURCES = MagickWand/drawtest.c
@@ -4663,8 +4663,8 @@ MAGICKWAND_CHECK_PGRMS = \
        MagickWand/wandtest
 
 MAGICKWAND_TESTS = \
-       MagickWand/drawtest.sh \
-       MagickWand/wandtest.sh
+       MagickWand/drawtest.tap \
+       MagickWand/wandtest.tap
 
 MAGICKWAND_CLEANFILES = \
        MagickWand/*_out.*
@@ -5000,20 +5000,20 @@ tests_validate_CPPFLAGS = $(AM_CPPFLAGS)
 tests_validate_LDADD = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS)
 TESTS_XFAIL_TESTS = 
 TESTS_TESTS = \
-       tests/validate-compare.sh \
-       tests/validate-composite.sh \
-       tests/validate-convert.sh \
-       tests/validate-identify.sh \
-       tests/validate-import.sh \
-       tests/validate-montage.sh \
-       tests/validate-pipe.sh \
-       tests/validate-colorspace.sh \
-       tests/validate-stream.sh \
-       tests/validate-formats-in-memory.sh \
-       tests/validate-formats-on-disk.sh
+       tests/validate-compare.tap \
+       tests/validate-composite.tap \
+       tests/validate-convert.tap \
+       tests/validate-identify.tap \
+       tests/validate-import.tap \
+       tests/validate-montage.tap \
+       tests/validate-pipe.tap \
+       tests/validate-colorspace.tap \
+       tests/validate-stream.tap \
+       tests/validate-formats-in-memory.tap \
+       tests/validate-formats-on-disk.tap
 
 TESTS_EXTRA_DIST = \
-       tests/common.sh \
+       tests/common.shi \
        $(TESTS_TESTS)
 
 TESTS_CLEANFILES = 

diff --git a/config/ImageMagick.rdf b/config/ImageMagick.rdf
index 2f367120456d4622b2e3cd5d25bc2cf048434833..9ce170e25252637a9abe92848a121ce0a3bedad9 100644 (file)
--- a/config/ImageMagick.rdf
+++ b/config/ImageMagick.rdf
@@ -5,7 +5,7 @@
     <name>ImageMagick</name>
     <shortdesc xml:lang="en">ImageMagick: convert, edit, and compose images.</shortdesc>
     <homepage rdf:resource="http://www.imagemagick.org/"/>
-    <created>2012-08-20</created>
+    <created>2012-08-21</created>
 
     <description xml:lang="en">
 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
     <release>
       <Version>
           <name>stable</name>
-          <created>2012-08-20</created>
+          <created>2012-08-21</created>
           <revision>7.0.0</revision>
           <patch-level>-0</patch-level>
       </Version>

diff --git a/config/configure.xml b/config/configure.xml
index fe957b8f69833d99d4098097134fc80bb32035f5..c0830044e59451dd30b72ec0502006f676c31817 100644 (file)
--- a/config/configure.xml
+++ b/config/configure.xml
@@ -10,8 +10,8 @@
   <configure name="VERSION" value="7.0.0"/>
   <configure name="LIB_VERSION" value="0x700"/>
   <configure name="LIB_VERSION_NUMBER" value="7,0,0,0"/>
-  <configure name="SVN_REVISION" value="9013:9029M" />
-  <configure name="RELEASE_DATE" value="2012-08-20"/>
+  <configure name="SVN_REVISION" value="9013:9032M" />
+  <configure name="RELEASE_DATE" value="2012-08-21"/>
   <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 85c3e9d0e8a33169af7c7c7eb5bf6c1ab8ed5909..1bd307c101eea35cece357a8353aa7c21152dc74 100755 (executable)
--- a/configure
+++ b/configure
@@ -3666,7 +3666,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=9013:9029M
+MAGICK_SVN_REVISION=9013:9032M
 
 
 

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 6dfd7e91d55cb42b3542231729ec914e8707b9c8..629ae7a2461b5c8fdd1d3bddb7f48c798cd44f8c 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -24,20 +24,20 @@ tests_validate_LDADD = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS)
 TESTS_XFAIL_TESTS = 
 
 TESTS_TESTS = \
-       tests/validate-compare.sh \
-       tests/validate-composite.sh \
-       tests/validate-convert.sh \
-       tests/validate-identify.sh \
-       tests/validate-import.sh \
-       tests/validate-montage.sh \
-       tests/validate-pipe.sh \
-       tests/validate-colorspace.sh \
-       tests/validate-stream.sh \
-       tests/validate-formats-in-memory.sh \
-       tests/validate-formats-on-disk.sh
+       tests/validate-compare.tap \
+       tests/validate-composite.tap \
+       tests/validate-convert.tap \
+       tests/validate-identify.tap \
+       tests/validate-import.tap \
+       tests/validate-montage.tap \
+       tests/validate-pipe.tap \
+       tests/validate-colorspace.tap \
+       tests/validate-stream.tap \
+       tests/validate-formats-in-memory.tap \
+       tests/validate-formats-on-disk.tap
 
 TESTS_EXTRA_DIST = \
-       tests/common.sh \
+       tests/common.shi \
        $(TESTS_TESTS)
 
 TESTS_CLEANFILES = 

diff --git a/tests/common.sh b/tests/common.shi
similarity index 100%
rename from tests/common.sh
rename to tests/common.shi