Changeset 7046

Timestamp:

03/04/12 17:07:58 (15 months ago)

Author:

cristy

Message:

 

Location:

ImageMagick/branches/ImageMagick-6.7.5

Files:

• ChangeLog (modified) (1 diff)
• ImageMagick.spec (modified) (1 diff)
• coders/caption.c (modified) (12 diffs)
• config/configure.xml (modified) (1 diff)
• configure (modified) (9 diffs)
• configure.ac (modified) (1 diff)
• libtool (modified) (1 diff)
• magick/magick-config.h (modified) (3 diffs)
• magick/version.h (modified) (1 diff)
• version.sh (modified) (1 diff)

ImageMagick/branches/ImageMagick-6.7.5/ChangeLog

@@ -1 +1 @@
 2012-03-02  6.7.5-9 Cristy  <quetzlzacatenango@image...>
-  * New version 6.7.5-9, SVN revision 7043.
+  * New version 6.7.5-9, SVN revision 7046.
 
 2012-02-29  6.7.5-9 Cristy  <quetzlzacatenango@image...>
   * Caption no long includes the prefix "caption:" in the rendered text.
+  * Auto scale pointsize for -size 100x100 caption:
 
 2012-03-02  6.7.5-8 Cristy  <quetzlzacatenango@image...>

ImageMagick/branches/ImageMagick-6.7.5/ImageMagick.spec

@@ -1 +1 @@
 %global VERSION  6.7.5
-%global Patchlevel  10
+%global Patchlevel  9
 
 Name:           ImageMagick

ImageMagick/branches/ImageMagick-6.7.5/coders/caption.c

@@ -110 +110 @@
 }
 
-static Image *ReadCAPTIONImage(const ImageInfo *image_info,
-  ExceptionInfo *exception)
+static MagickBooleanType PangoImage(const ImageInfo *image_info,Image *image,
+  const DrawInfo *draw_info,ExceptionInfo *exception)
 {
   char
@@ -120 +120 @@
     *option;
 
-  DrawInfo
-    *draw_info;
-
   FT_Bitmap
     *canvas;
 
-  Image
-    *image;
-
   PangoAlignment
     align;
@@ -165 +159 @@
     y;
 
-  /*
-    Initialize Image structure.
-  */
-  assert(image_info != (const ImageInfo *) NULL);
-  assert(image_info->signature == MagickSignature);
-  if (image_info->debug != MagickFalse)
-    (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
-      image_info->filename);
-  assert(exception != (ExceptionInfo *) NULL);
-  assert(exception->signature == MagickSignature);
-  image=AcquireImage(image_info);
-  (void) ResetImagePage(image,"0x0+0+0");
   /*
     Get context.
@@ -190 +172 @@
   if (option != (const char *) NULL)
     pango_context_set_language(context,pango_language_from_string(option));
-  draw_info=CloneDrawInfo(image_info,(DrawInfo *) NULL);
   pango_context_set_base_dir(context,draw_info->direction ==
     RightToLeftDirection ? PANGO_DIRECTION_RTL : PANGO_DIRECTION_LTR);
@@ -264 +245 @@
   description=pango_font_description_from_string(draw_info->font ==
     (char *) NULL ? "helvetica" : draw_info->font);
-  pango_font_description_set_size(description,PANGO_SCALE*draw_info->pointsize);
+  pango_font_description_set_size(description,(int) (0.9*PANGO_SCALE*
+    draw_info->pointsize+0.5));
   pango_layout_set_font_description(layout,description);
   pango_font_description_free(description);
@@ -318 +300 @@
   canvas=(FT_Bitmap *) AcquireMagickMemory(sizeof(*canvas));
   if (canvas == (FT_Bitmap *) NULL)
-    {
-      draw_info=DestroyDrawInfo(draw_info);
-      ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed");
-    }
+    ThrowBinaryException(ResourceLimitError,"MemoryAllocationFailed",
+      image->filename);
   canvas->width=image->columns;
   canvas->pitch=(canvas->width+3) & ~3;
@@ -329 +309 @@
   if (canvas->buffer == (unsigned char *) NULL)
     {
-      draw_info=DestroyDrawInfo(draw_info);
       canvas=(FT_Bitmap *) RelinquishMagickMemory(canvas);
-      ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed");
+      ThrowBinaryException(ResourceLimitError,"MemoryAllocationFailed",
+        image->filename);
     }
   canvas->num_grays=256;
@@ -344 +324 @@
   if (SetImageBackgroundColor(image) == MagickFalse)
     {
-      draw_info=DestroyDrawInfo(draw_info);
       canvas->buffer=(unsigned char *) RelinquishMagickMemory(canvas->buffer);
       canvas=(FT_Bitmap *) RelinquishMagickMemory(canvas);
       caption=DestroyString(caption);
       image=DestroyImageList(image);
-      return((Image *) NULL);
+      return(MagickFalse);
     }
   p=canvas->buffer;
@@ -381 +360 @@
     Relinquish resources.
   */
-  draw_info=DestroyDrawInfo(draw_info);
   canvas->buffer=(unsigned char *) RelinquishMagickMemory(canvas->buffer);
   canvas=(FT_Bitmap *) RelinquishMagickMemory(canvas);
   caption=DestroyString(caption);
-  return(GetFirstImageInList(image));
+  return(MagickTrue);
 }
-#else
+#endif
+
 static Image *ReadCAPTIONImage(const ImageInfo *image_info,
   ExceptionInfo *exception)
@@ -397 +376 @@
 
   const char
-    *gravity;
+    *gravity,
+    *option;
 
   DrawInfo
@@ -436 +416 @@
   */
   property=InterpretImageProperties(image_info,image,image_info->filename);
+  option=GetImageOption(image_info,"filename");
+  if (option == (const char *) NULL)
+    property=InterpretImageProperties(image_info,image,image_info->filename);
+  else
+    if (LocaleNCompare(option,"caption:",8) == 0)
+      property=InterpretImageProperties(image_info,image,option+8);
+    else
+      property=InterpretImageProperties(image_info,image,option);
   (void) SetImageProperty(image,"caption",property);
   property=DestroyString(property);
@@ -524 +512 @@
       draw_info->geometry=AcquireString(geometry);
     }
-  (void) AnnotateImage(image,draw_info);
+#if defined(MAGICKCORE_PANGOFT2_DELEGATE)
+  status=PangoImage(image_info,image,draw_info,exception);
+#else
+  status=AnnotateImage(image,draw_info,exception);
+#endif
   draw_info=DestroyDrawInfo(draw_info);
   caption=DestroyString(caption);
+  if (status == MagickFalse)
+    {
+      image=DestroyImageList(image);
+      return((Image *) NULL);
+    }
   return(GetFirstImageInList(image));
 }
-#endif
 
 /*

ImageMagick/branches/ImageMagick-6.7.5/config/configure.xml

@@ -10 +10 @@
   <configure name="VERSION" value="6.7.5"/>
   <configure name="LIB_VERSION" value="0x675"/>
-  <configure name="LIB_VERSION_NUMBER" value="6,7,5,10"/>
+  <configure name="LIB_VERSION_NUMBER" value="6,7,5,9"/>
   <configure name="SVN_REVISION" value="7029" />
   <configure name="RELEASE_DATE" value="2012-03-04"/>

ImageMagick/branches/ImageMagick-6.7.5/configure

@@ -1 +1 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for ImageMagick 6.7.5-10.
+# Generated by GNU Autoconf 2.68 for ImageMagick 6.7.5-9.
 #
 # Report bugs to <http://www.imagemagick.org>.
@@ -575 +575 @@
 PACKAGE_NAME='ImageMagick'
 PACKAGE_TARNAME='ImageMagick'
-PACKAGE_VERSION='6.7.5-10'
-PACKAGE_STRING='ImageMagick 6.7.5-10'
+PACKAGE_VERSION='6.7.5-9'
+PACKAGE_STRING='ImageMagick 6.7.5-9'
 PACKAGE_BUGREPORT='http://www.imagemagick.org'
 PACKAGE_URL=''
@@ -1741 +1741 @@
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures ImageMagick 6.7.5-10 to adapt to many kinds of systems.
+\`configure' configures ImageMagick 6.7.5-9 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1816 +1816 @@
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of ImageMagick 6.7.5-10:";;
+     short | recursive ) echo "Configuration of ImageMagick 6.7.5-9:";;
    esac
   cat <<\_ACEOF
@@ -2035 +2035 @@
 if $ac_init_version; then
   cat <<\_ACEOF
-ImageMagick configure 6.7.5-10
+ImageMagick configure 6.7.5-9
 generated by GNU Autoconf 2.68
 
@@ -3078 +3078 @@
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by ImageMagick $as_me 6.7.5-10, which was
+It was created by ImageMagick $as_me 6.7.5-9, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
@@ -4101 +4101 @@
 # Define the identity of the package.
  PACKAGE='ImageMagick'
- VERSION='6.7.5-10'
+ VERSION='6.7.5-9'
 
 
@@ -36481 +36481 @@
 # values after options handling.
 ac_log="
-This file was extended by ImageMagick $as_me 6.7.5-10, which was
+This file was extended by ImageMagick $as_me 6.7.5-9, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
@@ -36547 +36547 @@
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-ImageMagick config.status 6.7.5-10
+ImageMagick config.status 6.7.5-9
 configured by $0, generated by GNU Autoconf 2.68,
   with options \\"\$ac_cs_config\\"

ImageMagick/branches/ImageMagick-6.7.5/configure.ac

@@ -20 +20 @@
 m4_define([magick_minor_version], [7])
 m4_define([magick_micro_version], [5])
-m4_define([magick_patchlevel_version], [10])
+m4_define([magick_patchlevel_version], [9])
 m4_define([magick_version],
           [magick_major_version.magick_minor_version.magick_micro_version-magick_patchlevel_version])

ImageMagick/branches/ImageMagick-6.7.5/libtool

@@ -2 +2 @@
 
 # libtool - Provide generalized library-building support services.
-# Generated automatically by config.status (ImageMagick) 6.7.5-10
+# Generated automatically by config.status (ImageMagick) 6.7.5-9
 # Libtool was configured on host magick.imagemagick.org:
 # NOTE: Changes made to this file will be lost: look at ltmain.sh.

ImageMagick/branches/ImageMagick-6.7.5/magick/magick-config.h

@@ -1303 +1303 @@
 /* Define to the full name and version of this package. */
 #ifndef MAGICKCORE_PACKAGE_STRING
-#define MAGICKCORE_PACKAGE_STRING "ImageMagick 6.7.5-10"
+#define MAGICKCORE_PACKAGE_STRING "ImageMagick 6.7.5-9"
 #endif
 
@@ -1318 +1318 @@
 /* Define to the version of this package. */
 #ifndef MAGICKCORE_PACKAGE_VERSION
-#define MAGICKCORE_PACKAGE_VERSION "6.7.5-10"
+#define MAGICKCORE_PACKAGE_VERSION "6.7.5-9"
 #endif
 
@@ -1508 +1508 @@
 /* Version number of package */
 #ifndef MAGICKCORE_VERSION
-#define MAGICKCORE_VERSION "6.7.5-10"
+#define MAGICKCORE_VERSION "6.7.5-9"
 #endif
 

ImageMagick/branches/ImageMagick-6.7.5/magick/version.h

@@ -32 +32 @@
 #define MagickLibVersionText  "6.7.5"
 #define MagickLibVersionNumber  5,0,0
-#define MagickLibAddendum  "-10"
+#define MagickLibAddendum  "-9"
 #define MagickLibInterface  5
 #define MagickLibMinInterface  5

ImageMagick/branches/ImageMagick-6.7.5/version.sh

@@ -14 +14 @@
 PACKAGE_PERL_VERSION='6.75'
 PACKAGE_LIB_VERSION="0x675"
-PACKAGE_RELEASE="10"
+PACKAGE_RELEASE="9"
 PACKAGE_LIB_VERSION_NUMBER="6,7,5,${PACKAGE_RELEASE}"
 PACKAGE_RELEASE_DATE=`date +%F`