(no commit message)

diff --git a/Magick++/tests/exceptions.cpp b/Magick++/tests/exceptions.cpp
index de78bc1af700e3b675ad72051c34d4bf33a6e75d..a7f63c6bb2097e030eb5ddcc7f8d49f921b8c745 100644 (file)
--- a/Magick++/tests/exceptions.cpp
+++ b/Magick++/tests/exceptions.cpp
@@ -39,10 +39,14 @@ int main( int /*argc*/, char ** argv)
     try
       {
         failures++;
+        cout << "Throwing 'Magick::WarningResourceLimit' exception" << endl;
+        cout.flush();
         throw WarningResourceLimit("How now brown cow?");
       }
     catch( Exception & /*error_*/ )
       {
+        cout << "Successfully caught 'Magick::WarningResourceLimit' exception" << endl;
+        cout.flush();
         failures--;
       }
       
@@ -59,10 +63,14 @@ int main( int /*argc*/, char ** argv)
           try
             {
               failures++;
+              cout << "Throwing library 'Magick::Exception' exception" << endl;
+              cout.flush();
               image.directory();
             }
           catch ( Exception& /*error_*/ )
             {
+              cout << "Successfully caught library 'Magick::Exception' exception" << endl;
+              cout.flush();
               failures--;
             }
         }
@@ -70,21 +78,24 @@ int main( int /*argc*/, char ** argv)
       }
     catch( Exception &error_ )
       {
-        cout << "Caught exception: " << error_.what() << endl;
+        cout << "Bogus catch: Caught exception: " << error_.what() << endl;
+        cout.flush();
         return 1;
       }
     catch( exception &error_ )
       {
-        cout << "Caught exception: " << error_.what() << endl;
+        cout << "Bogus catch: Caught exception: " << error_.what() << endl;
+        cout.flush();
         return 1;
       }
   
     if ( failures )
       {
         cout << failures << " failures" << endl;
+        cout.flush();
         return 1;
       }
-    cout << "passed!" << endl;
+    cout << "Exception testing passed!" << endl;
   }
 
   return 0;

diff --git a/magick/version.h b/magick/version.h
index 751385301b9ccc400e2bfca228f9f2beea9526ee..77c80195bd0757edb65551589eed23467a982aa1 100644 (file)
--- a/magick/version.h
+++ b/magick/version.h
@@ -31,6 +31,7 @@ extern "C" {
 #define MagickLibVersionText  "6.5.9"
 #define MagickLibVersionNumber  2,0,1
 #define MagickLibSubversion  "-0"
+#define MagickLibInterface  2
 #define MagickReleaseDate  "2010-01-06"
 #define MagickChangeDate   "20100101"
 #define MagickAuthoritativeURL  "http://www.imagemagick.org"

diff --git a/magick/version.h.in b/magick/version.h.in
index 16c44a3c77c176cc1bddb80bcf3a4e4eb0f337f0..76c602965b848da2c07354f38bf3ef3a6b7ab340 100644 (file)
--- a/magick/version.h.in
+++ b/magick/version.h.in
@@ -31,6 +31,7 @@ extern "C" {
 #define MagickLibVersionText  "@MAGICK_LIB_VERSION_TEXT@"
 #define MagickLibVersionNumber  @MAGICK_LIB_VERSION_NUMBER@
 #define MagickLibSubversion  "@PACKAGE_LIB_SUBVERSION@"
+#define MagickLibInterface  @MAGICK_LIBRARY_CURRENT@
 #define MagickReleaseDate  "@PACKAGE_RELEASE_DATE@"
 #define MagickChangeDate   "@PACKAGE_CHANGE_DATE@"
 #define MagickAuthoritativeURL  "http://www.imagemagick.org"