rmmain.c in rmagick-2.1.0

- old
+ new

@@ -1,8 +1,8 @@
-/* $Id: rmmain.c,v 1.228 2007/12/26 21:43:52 rmagick Exp $ */
+/* $Id: rmmain.c,v 1.233 2008/01/02 23:06:29 rmagick Exp $ */
 /*============================================================================\
-|                Copyright (C) 2007 by Timothy P. Hunter
+|                Copyright (C) 2008 by Timothy P. Hunter
 | Name:     rmmain.c
 | Author:   Tim Hunter
 | Purpose:  Contains all module, class, method declarations.
 |           Defines all constants
 |           Contains Magick module methods.
@@ -48,22 +48,22 @@
     {
         for (x = 0; x < number_colors; x++)
         {
             (void) rb_yield(Color_from_ColorInfo(color_info_list[x]));
         }
-        magick_free(color_info_list);
+        magick_free((void *)color_info_list);
         return class;
     }
     else
     {
         ary = rb_ary_new2((long) number_colors);
         for (x = 0; x < number_colors; x++)
         {
             (void) rb_ary_push(ary, Color_from_ColorInfo(color_info_list[x]));
         }
 
-        magick_free(color_info_list);
+        magick_free((void *)color_info_list);
         return ary;
     }
 }
 
 /*
@@ -88,21 +88,21 @@
     {
         for (x = 0; x < number_types; x++)
         {
             (void) rb_yield(Font_from_TypeInfo((TypeInfo *)type_info[x]));
         }
-        magick_free(type_info);
+        magick_free((void *)type_info);
         return class;
     }
     else
     {
         ary = rb_ary_new2((long)number_types);
         for (x = 0; x < number_types; x++)
         {
             (void) rb_ary_push(ary, Font_from_TypeInfo((TypeInfo *)type_info[x]));
         }
-        magick_free(type_info);
+        magick_free((void *)type_info);
         return ary;
     }
 
 }
 
@@ -322,11 +322,11 @@
 void
 Init_RMagick2(void)
 {
     volatile VALUE observable;
 
-#if defined(HAVE_MagickCoreGenesis)
+#if defined(HAVE_MAGICKCOREGENESIS)
     MagickCoreGenesis("RMagick", MagickFalse);
 #else
     InitializeMagick("RMagick");
 #endif
 
@@ -852,10 +852,11 @@
     DCL_ATTR_ACCESSOR(Info, antialias)
     DCL_ATTR_ACCESSOR(Info, attenuate)
     DCL_ATTR_ACCESSOR(Info, authenticate)
     DCL_ATTR_ACCESSOR(Info, background_color)
     DCL_ATTR_ACCESSOR(Info, border_color)
+    DCL_ATTR_ACCESSOR(Info, caption)
     DCL_ATTR_ACCESSOR(Info, colorspace)
     DCL_ATTR_ACCESSOR(Info, comment)
     DCL_ATTR_ACCESSOR(Info, compression)
     DCL_ATTR_ACCESSOR(Info, delay)
     DCL_ATTR_ACCESSOR(Info, density)
@@ -1628,17 +1629,10 @@
 */
 static void test_Magick_version(void)
 {
     unsigned long version_number;
     const char *version_str;
-    const char *web_site =
-#if defined(MagickHomeURL)
-    MagickHomeURL
-#else
-    MagickWebSite
-#endif
-    ;
     int x, n;
     ID bypass = rb_intern("RMAGICK_BYPASS_VERSION_TEST");
 
     if (RTEST(rb_const_defined(rb_cObject, bypass)) && RTEST(rb_const_get(rb_cObject, bypass)))
     {
@@ -1657,16 +1651,12 @@
                 break;
             }
         }
 
         rb_raise(rb_eRuntimeError,
-                 "This version of RMagick was created to run with %s %s\n"
-                 "but %.*s is installed on this system. You should either\n"
-                 "   1) Configure and build RMagick for %.*s, or\n"
-                 "   2) download %s %s from %s and install it.\n" ,
-                 MagickPackageName, MagickLibVersionText, x, version_str, x, version_str,
-                 MagickPackageName, MagickLibVersionText, web_site);
+                 "This version of RMagick was created to run with %s %s but %.*s is in use.\n" ,
+                 MagickPackageName, MagickLibVersionText, x, version_str);
     }
 
 }
 
 
@@ -1692,10 +1682,10 @@
     str = rb_str_new2(Q(RMAGICK_VERSION_STRING));
     OBJ_FREEZE(str);
     rb_define_const(Module_Magick, "Version", str);
 
     sprintf(long_version,
-            "This is %s ($Date: 2007/12/26 21:43:52 $) Copyright (C) 2007 by Timothy P. Hunter\n"
+            "This is %s ($Date: 2008/01/02 23:06:29 $) Copyright (C) 2008 by Timothy P. Hunter\n"
             "Built with %s\n"
             "Built for %s\n"
             "Web page: http://rmagick.rubyforge.org\n"
             "Email: rmagick@rubyforge.org\n",
             Q(RMAGICK_VERSION_STRING), mgk_version, Q(RUBY_VERSION_STRING));