]> granicus.if.org Git - imagemagick/blobdiff - coders/pango.c
(no commit message)
[imagemagick] / coders / pango.c
index 8cba35c54951cf5bc2480e385ed090709bb95ff7..5d6221e40f6b55b88b506a460569257a47ef0d79 100644 (file)
@@ -5,16 +5,16 @@
 %                                                                             %
 %                     PPPP    AAA   N   N   GGGG   OOO                        %
 %                     P   P  A   A  NN  N  G      O   O                       %
-%                     PPPP   AAAAA  N N N  G  GG  O   O                       %
-%                     P      A   A  N  NN  G   G  O   O                       %
-%                     P      A   A  N   N   GGG    OOO                        %
+%                     PPPP   AAAAA  N N N  G GGG  O   O                       %
+%                     P   M  A   A  N  NN  G   G  O   O                       %
+%                     P      A   A  N   N   GGGG   OOO                        %
 %                                                                             %
 %                                                                             %
-%                             Read Text Caption.                              %
+%                     Read Pango Markup Language Format                       %
 %                                                                             %
 %                              Software Design                                %
 %                                John Cristy                                  %
-%                               February 2002                                 %
+%                                 March 2012                                  %
 %                                                                             %
 %                                                                             %
 %  Copyright 1999-2012 ImageMagick Studio LLC, a non-profit organization      %
 #include "MagickCore/magick.h"
 #include "MagickCore/memory_.h"
 #include "MagickCore/module.h"
+#include "MagickCore/monitor.h"
+#include "MagickCore/monitor-private.h"
 #include "MagickCore/option.h"
+#include "MagickCore/pixel-accessor.h"
 #include "MagickCore/property.h"
 #include "MagickCore/quantum-private.h"
 #include "MagickCore/static.h"
 #include "MagickCore/string_.h"
 #include "MagickCore/string-private.h"
+#include "MagickCore/token.h"
 #include "MagickCore/utility.h"
-#if defined(MAGICKCORE_PANGOFT2_DELEGATE)
+#if defined(MAGICKCORE_PANGOCAIRO_DELEGATE)
 #include <pango/pango.h>
-#include <pango/pangoft2.h>
+#include <pango/pangocairo.h>
 #include <pango/pango-features.h>
 #endif
 \f
+#if defined(MAGICKCORE_PANGOCAIRO_DELEGATE)
 /*
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %                                                                             %
@@ -78,9 +83,7 @@
 %                                                                             %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
-%  ReadPANGOImage() reads a PANGO image file and returns it.  It
-%  allocates the memory necessary for the new Image structure and returns a
-%  pointer to the new image.
+%  ReadPANGOImage() reads an image in the Pango Markup Language Format.
 %
 %  The format of the ReadPANGOImage method is:
 %
 %    o exception: return any errors or warnings in this structure.
 %
 */
-#if defined(MAGICKCORE_PANGOFT2_DELEGATE)
-static void PangoSubstitute(FcPattern *pattern,void *context)
+static Image *ReadPANGOImage(const ImageInfo *image_info,
+  ExceptionInfo *exception)
 {
-  const char
-    *option;
+  cairo_font_options_t
+    *font_options;
 
-  option=(const char *) context;
-  if (option == (const char *) NULL)
-    return;
-  FcPatternDel(pattern,FC_HINTING);
-  FcPatternAddBool(pattern, FC_HINTING,LocaleCompare(option,"none") != 0);
-  FcPatternDel(pattern,FC_AUTOHINT);
-  FcPatternAddBool(pattern,FC_AUTOHINT,LocaleCompare(option,"auto") == 0);
-}
+  cairo_surface_t
+    *surface;
+
+  char
+    *caption,
+    *property;
+
+  cairo_t
+    *cairo_image;
 
-static MagickBooleanType PangoImage(const ImageInfo *image_info,Image *image,
-  const DrawInfo *draw_info,ExceptionInfo *exception)
-{
   const char
     *option;
 
-  FT_Bitmap
-    *canvas;
+  DrawInfo
+    *draw_info;
+
+  Image
+    *image;
+
+  MagickBooleanType
+    status;
 
   PangoAlignment
     align;
@@ -124,9 +131,6 @@ static MagickBooleanType PangoImage(const ImageInfo *image_info,Image *image,
   PangoContext
     *context;
 
-  PangoFontDescription
-    *description;
-
   PangoFontMap
     *fontmap;
 
@@ -145,37 +149,100 @@ static MagickBooleanType PangoImage(const ImageInfo *image_info,Image *image,
   RectangleInfo
     page;
 
-  register Quantum
-    *q;
-
   register unsigned char
     *p;
 
+  size_t
+    stride;
+
   ssize_t
     y;
 
+  unsigned char
+    *pixels;
+
+  /*
+    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,exception);
+  (void) ResetImagePage(image,"0x0+0+0");
+  /*
+    Format caption.
+  */
+  option=GetImageOption(image_info,"filename");
+  if (option == (const char *) NULL)
+    property=InterpretImageProperties(image_info,image,image_info->filename,
+      exception);
+  else
+    if (LocaleNCompare(option,"pango:",6) == 0)
+      property=InterpretImageProperties(image_info,image,option+6,exception);
+    else
+      property=InterpretImageProperties(image_info,image,option,exception);
+  (void) SetImageProperty(image,"caption",property,exception);
+  property=DestroyString(property);
+  caption=ConstantString(GetImageProperty(image,"caption",exception));
   /*
     Get context.
   */
-  fontmap=(PangoFontMap *) pango_ft2_font_map_new();
-  pango_ft2_font_map_set_resolution((PangoFT2FontMap *) fontmap,
-    image->resolution.x,image->resolution.y);
+  fontmap=pango_cairo_font_map_new();
+  pango_cairo_font_map_set_resolution(PANGO_CAIRO_FONT_MAP(fontmap),
+    image->resolution.x);
+  font_options=cairo_font_options_create();
   option=GetImageOption(image_info,"pango:hinting");
-  pango_ft2_font_map_set_default_substitute((PangoFT2FontMap *) fontmap,
-    PangoSubstitute,(char *) option,NULL);
+  if (option != (const char *) NULL)
+    {
+      if (LocaleCompare(option,"none") != 0)
+        cairo_font_options_set_hint_style(font_options,CAIRO_HINT_STYLE_NONE);
+      if (LocaleCompare(option,"full") != 0)
+        cairo_font_options_set_hint_style(font_options,CAIRO_HINT_STYLE_FULL);
+    }
   context=pango_font_map_create_context(fontmap);
+  pango_cairo_context_set_font_options(context,font_options);
+  cairo_font_options_destroy(font_options);
   option=GetImageOption(image_info,"pango:language");
   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);
   switch (draw_info->gravity)
   {
-    case NorthGravity: gravity=PANGO_GRAVITY_NORTH; break;
-    case WestGravity: gravity=PANGO_GRAVITY_WEST; break;
-    case EastGravity: gravity=PANGO_GRAVITY_EAST; break;
-    case SouthGravity: gravity=PANGO_GRAVITY_SOUTH; break;
-    default: gravity=PANGO_GRAVITY_AUTO; break;
+    case NorthGravity:
+    {
+      gravity=PANGO_GRAVITY_NORTH;
+      break;
+    }
+    case NorthWestGravity:
+    case WestGravity:
+    case SouthWestGravity:
+    {
+      gravity=PANGO_GRAVITY_WEST;
+      break;
+    }
+    case NorthEastGravity:
+    case EastGravity:
+    case SouthEastGravity:
+    {
+      gravity=PANGO_GRAVITY_EAST;
+      break;
+    }
+    case SouthGravity:
+    {
+      gravity=PANGO_GRAVITY_SOUTH;
+      break;
+    }
+    default:
+    {
+      gravity=PANGO_GRAVITY_AUTO;
+      break;
+    }
   }
   pango_context_set_base_gravity(context,gravity);
   option=GetImageOption(image_info,"pango:gravity-hint");
@@ -208,10 +275,10 @@ static MagickBooleanType PangoImage(const ImageInfo *image_info,Image *image,
         pango_layout_set_ellipsize(layout,PANGO_ELLIPSIZE_START);
     }
   option=GetImageOption(image_info,"pango:justify");
-  if ((option != (const char *) NULL) && (IsMagickTrue(option) != MagickFalse))
+  if (IfMagickTrue(IsStringTrue(option)))
     pango_layout_set_justify(layout,1);
   option=GetImageOption(image_info,"pango:single-paragraph");
-  if ((option != (const char *) NULL) && (IsMagickTrue(option) != MagickFalse))
+  if (IfMagickTrue(IsStringTrue(option)))
     pango_layout_set_single_paragraph_mode(layout,1);
   option=GetImageOption(image_info,"pango:wrap");
   if (option != (const char *) NULL)
@@ -225,8 +292,8 @@ static MagickBooleanType PangoImage(const ImageInfo *image_info,Image *image,
     }
   option=GetImageOption(image_info,"pango:indent");
   if (option != (const char *) NULL)
-    pango_layout_set_indent(layout,(StringToLong(option)*image->resolution.x*
-      PANGO_SCALE+36)/72);
+    pango_layout_set_indent(layout,(int) ((StringToLong(option)*
+      image->resolution.x*PANGO_SCALE+36)/72.0+0.5));
   switch (draw_info->align)
   {
     case CenterAlign: align=PANGO_ALIGN_CENTER; break;
@@ -235,7 +302,7 @@ static MagickBooleanType PangoImage(const ImageInfo *image_info,Image *image,
     default:
     {
       if (draw_info->gravity == CenterGravity)
-        {  
+        {
           align=PANGO_ALIGN_CENTER;
           break;
         }
@@ -247,20 +314,34 @@ static MagickBooleanType PangoImage(const ImageInfo *image_info,Image *image,
       (draw_info->direction == RightToLeftDirection))
     align=(PangoAlignment) (PANGO_ALIGN_LEFT+PANGO_ALIGN_RIGHT-align);
   pango_layout_set_alignment(layout,align);
-  description=pango_font_description_from_string(draw_info->font ==
-    (char *) NULL ? "helvetica" : draw_info->font);
-  pango_font_description_set_size(description,(int) (0.815*PANGO_SCALE*
-    draw_info->pointsize+0.5));
-  pango_layout_set_font_description(layout,description);
-  pango_font_description_free(description);
-  /*
-    Render caption.
-  */
+  if (draw_info->font != (char *) NULL)
+    {
+      PangoFontDescription
+        *description;
+
+      /*
+        Set font.
+      */
+      description=pango_font_description_from_string(draw_info->font);
+      pango_font_description_set_size(description,(int) (PANGO_SCALE*
+        draw_info->pointsize+0.5));
+      pango_layout_set_font_description(layout,description);
+      pango_font_description_free(description);
+    }
   option=GetImageOption(image_info,"pango:markup");
-  if ((option != (const char *) NULL) && (IsMagickTrue(option) != MagickFalse))
-    pango_layout_set_markup(layout,draw_info->text,-1);
+  if ((option != (const char *) NULL) && (IsStringTrue(option) == MagickFalse))
+    pango_layout_set_text(layout,caption,-1);
   else
-    pango_layout_set_text(layout,draw_info->text,-1);
+    {
+      GError
+        *error;
+
+      error=(GError *) NULL;
+      if (pango_parse_markup(caption,-1,0,NULL,NULL,NULL,&error) == 0)
+        (void) ThrowMagickException(exception,GetMagickModule(),CoderError,
+          error->message,"`%s'",image_info->filename);
+      pango_layout_set_markup(layout,caption,-1);
+    }
   pango_layout_context_changed(layout);
   page.x=0;
   page.y=0;
@@ -269,259 +350,107 @@ static MagickBooleanType PangoImage(const ImageInfo *image_info,Image *image,
   if (image->columns == 0)
     {
       pango_layout_get_pixel_extents(layout,NULL,&extent);
-      image->columns=extent.x+extent.width;
+      image->columns=extent.x+extent.width+2*page.x;
     }
   else
     {
       image->columns-=2*page.x;
-      pango_layout_set_width(layout,(PANGO_SCALE*image->columns*
-        image->resolution.x+36.0)/72.0);
+      pango_layout_set_width(layout,(int) ((PANGO_SCALE*image->columns*
+        image->resolution.x+36.0)/72.0+0.5));
     }
   if (image->rows == 0)
     {
       pango_layout_get_pixel_extents(layout,NULL,&extent);
-      image->rows=extent.y+extent.height;
+      image->rows=extent.y+extent.height+2*page.y;
     }
   else
     {
       image->rows-=2*page.y;
-      pango_layout_set_height(layout,(PANGO_SCALE*image->rows*
-        image->resolution.y+36.0)/72.0);
+      pango_layout_set_height(layout,(int) ((PANGO_SCALE*image->rows*
+        image->resolution.y+36.0)/72.0+0.5));
     }
   /*
-    Create canvas.
+    Render markup.
   */
-  canvas=(FT_Bitmap *) AcquireMagickMemory(sizeof(*canvas));
-  if (canvas == (FT_Bitmap *) NULL)
-    ThrowBinaryException(ResourceLimitError,"MemoryAllocationFailed",
-      image->filename);
-  canvas->width=image->columns;
-  canvas->pitch=(canvas->width+3) & ~3;
-  canvas->rows=image->rows;
-  canvas->buffer=(unsigned char *) AcquireQuantumMemory(canvas->pitch,
-    canvas->rows*sizeof(*canvas->buffer));
-  if (canvas->buffer == (unsigned char *) NULL)
+  stride=(size_t) cairo_format_stride_for_width(CAIRO_FORMAT_ARGB32,
+    image->columns);
+  pixels=(unsigned char *) AcquireQuantumMemory(image->rows,stride*
+    sizeof(*pixels));
+  if (pixels == (unsigned char *) NULL)
     {
-      canvas=(FT_Bitmap *) RelinquishMagickMemory(canvas);
-      ThrowBinaryException(ResourceLimitError,"MemoryAllocationFailed",
-        image->filename);
+      draw_info=DestroyDrawInfo(draw_info);
+      caption=DestroyString(caption);
+      ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed");
     }
-  canvas->num_grays=256;
-  canvas->pixel_mode=ft_pixel_mode_grays;
-  ResetMagickMemory(canvas->buffer,0x00,canvas->pitch*canvas->rows);
-  pango_ft2_render_layout(canvas,layout,0,0);
+  surface=cairo_image_surface_create_for_data(pixels,CAIRO_FORMAT_ARGB32,
+    image->columns,image->rows,stride);
+  cairo_image=cairo_create(surface);
+  cairo_set_operator(cairo_image,CAIRO_OPERATOR_CLEAR);
+  cairo_paint(cairo_image);
+  cairo_set_operator(cairo_image,CAIRO_OPERATOR_OVER);
+  cairo_translate(cairo_image,page.x,page.y);
+  pango_cairo_show_layout(cairo_image,layout);
+  cairo_destroy(cairo_image);
+  cairo_surface_destroy(surface);
+  g_object_unref(layout);
+  g_object_unref(fontmap);
   /*
-    Convert caption to image.
+    Convert surface to image.
   */
-  image->columns+=2*page.x;
-  image->rows+=2*page.y;
-  if (SetImageBackgroundColor(image,exception) == MagickFalse)
-    {
-      canvas->buffer=(unsigned char *) RelinquishMagickMemory(canvas->buffer);
-      canvas=(FT_Bitmap *) RelinquishMagickMemory(canvas);
-      image=DestroyImageList(image);
-      return(MagickFalse);
-    }
+  (void) SetImageBackgroundColor(image,exception);
+  p=pixels;
   GetPixelInfo(image,&fill_color);
-  p=canvas->buffer;
-  for (y=page.y; y < (ssize_t) (image->rows-page.y); y++)
+  for (y=0; y < (ssize_t) image->rows; y++)
   {
+    register Quantum
+      *q;
+
     register ssize_t
       x;
 
     q=GetAuthenticPixels(image,0,y,image->columns,1,exception);
     if (q == (Quantum *) NULL)
       break;
-    q+=page.x*GetPixelChannels(image);
-    for (x=page.x; x < (ssize_t) (image->columns-page.x); x++)
+    for (x=0; x < (ssize_t) image->columns; x++)
     {
-      MagickRealType
-        fill_alpha;
-
-      (void) GetFillColor(draw_info,x,y,&fill_color,exception);
-      fill_alpha=(MagickRealType) (*p)/(canvas->num_grays-1);
-      if (draw_info->text_antialias == MagickFalse)
-        fill_alpha=fill_alpha >= 0.5 ? 1.0 : 0.0;
-      fill_alpha=fill_alpha*fill_color.alpha;
-      CompositePixelOver(image,&fill_color,fill_alpha,q,GetPixelAlpha(image,q),
-        q);
-      p++;
-      q+=GetPixelChannels(image);
-    }
-    for ( ; x < (ssize_t) ((canvas->width+3) & ~3); x++)
-      p++;
-  }
-  /*
-    Relinquish resources.
-  */
-  canvas->buffer=(unsigned char *) RelinquishMagickMemory(canvas->buffer);
-  canvas=(FT_Bitmap *) RelinquishMagickMemory(canvas);
-  return(MagickTrue);
-}
-#endif
-
-static Image *ReadPANGOImage(const ImageInfo *image_info,
-  ExceptionInfo *exception)
-{
-  char
-    *caption,
-    geometry[MaxTextExtent],
-    *property;
-
-  const char
-    *gravity,
-    *option;
-
-  DrawInfo
-    *draw_info;
-
-  Image
-    *image;
-
-  MagickBooleanType
-    status;
-
-  register ssize_t
-    i;
-
-  size_t
-    height,
-    width;
-
-  TypeMetric
-    metrics;
-
-  /*
-    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,exception);
-  if (image->columns == 0)
-    ThrowReaderException(OptionError,"MustSpecifyImageSize");
-  (void) ResetImagePage(image,"0x0+0+0");
-  /*
-    Format caption.
-  */
-  property=InterpretImageProperties(image_info,image,image_info->filename,
-    exception);
-  option=GetImageOption(image_info,"filename");
-  if (option == (const char *) NULL)
-    property=InterpretImageProperties(image_info,image,image_info->filename,
-      exception);
-  else
-    if (LocaleNCompare(option,"pango:",8) == 0)
-      property=InterpretImageProperties(image_info,image,option+8,exception);
-    else
-      property=InterpretImageProperties(image_info,image,option,exception);
-  (void) SetImageProperty(image,"caption",property,exception);
-  property=DestroyString(property);
-  caption=ConstantString(GetImageProperty(image,"caption",exception));
-  draw_info=CloneDrawInfo(image_info,(DrawInfo *) NULL);
-  (void) CloneString(&draw_info->text,caption);
-  gravity=GetImageOption(image_info,"gravity");
-  if (gravity != (char *) NULL)
-    draw_info->gravity=(GravityType) ParseCommandOption(MagickGravityOptions,
-      MagickFalse,gravity);
-  if ((*caption != '\0') && (image->rows != 0) &&
-      (image_info->pointsize == 0.0))
-    {
-      char
-        *text;
+      double
+        gamma;
 
+      fill_color.blue=(MagickRealType) ScaleCharToQuantum(*p++);
+      fill_color.green=(MagickRealType) ScaleCharToQuantum(*p++);
+      fill_color.red=(MagickRealType) ScaleCharToQuantum(*p++);
+      fill_color.alpha=(MagickRealType) ScaleCharToQuantum(*p++);
       /*
-        Scale text to fit bounding box.
+        Disassociate alpha.
       */
-      for ( ; ; )
-      {
-        text=AcquireString(caption);
-        i=FormatMagickCaption(image,draw_info,MagickFalse,&metrics,&text,
-          exception);
-        (void) CloneString(&draw_info->text,text);
-        text=DestroyString(text);
-        (void) FormatLocaleString(geometry,MaxTextExtent,"%+g%+g",
-          -metrics.bounds.x1,metrics.ascent);
-        if (draw_info->gravity == UndefinedGravity)
-          (void) CloneString(&draw_info->geometry,geometry);
-        status=GetMultilineTypeMetrics(image,draw_info,&metrics,exception);
-        (void) status;
-        width=(size_t) floor(metrics.width+draw_info->stroke_width+0.5);
-        height=(size_t) floor(metrics.height+draw_info->stroke_width+0.5);
-        if ((width > (image->columns+1)) || (height > (image->rows+1)))
-          break;
-        draw_info->pointsize*=2.0;
-      }
-      draw_info->pointsize/=2.0;
-      for ( ; ; )
+      gamma=1.0-QuantumScale*fill_color.alpha;
+      gamma=1.0/(fabs((double) gamma) <= MagickEpsilon ? 1.0 : gamma);
+      fill_color.blue*=gamma;
+      fill_color.green*=gamma;
+      fill_color.red*=gamma;
+      CompositePixelOver(image,&fill_color,fill_color.alpha,q,(MagickRealType)
+        GetPixelAlpha(image,q),q);
+      q+=GetPixelChannels(image);
+    }
+    if (SyncAuthenticPixels(image,exception) == MagickFalse)
+      break;
+    if (image->previous == (Image *) NULL)
       {
-        text=AcquireString(caption);
-        i=FormatMagickCaption(image,draw_info,MagickFalse,&metrics,&text,
-          exception);
-        (void) CloneString(&draw_info->text,text);
-        text=DestroyString(text);
-        (void) FormatLocaleString(geometry,MaxTextExtent,"%+g%+g",
-          -metrics.bounds.x1,metrics.ascent);
-        if (draw_info->gravity == UndefinedGravity)
-          (void) CloneString(&draw_info->geometry,geometry);
-        status=GetMultilineTypeMetrics(image,draw_info,&metrics,exception);
-        width=(size_t) floor(metrics.width+draw_info->stroke_width+0.5);
-        height=(size_t) floor(metrics.height+draw_info->stroke_width+0.5);
-        if ((width > (image->columns+1)) || (height > (image->rows+1)))
+        status=SetImageProgress(image,LoadImageTag,(MagickOffsetType) y,
+        image->rows);
+        if (status == MagickFalse)
           break;
-        draw_info->pointsize++;
       }
-      draw_info->pointsize--;
-    }
-  i=FormatMagickCaption(image,draw_info,MagickTrue,&metrics,&caption,exception);
-  if (image->rows == 0)
-    image->rows=(size_t) ((i+1)*(metrics.ascent-metrics.descent+
-      draw_info->interline_spacing+draw_info->stroke_width)+0.5);
-  if (image->rows == 0)
-    image->rows=(size_t) ((i+1)*draw_info->pointsize+
-      draw_info->interline_spacing+draw_info->stroke_width+0.5);
-  if (SetImageBackgroundColor(image,exception) == MagickFalse)
-    {
-      image=DestroyImageList(image);
-      return((Image *) NULL);
-    }
+  }
   /*
-    Draw caption.
+    Relinquish resources.
   */
-  (void) CloneString(&draw_info->text,caption);
-  status=GetMultilineTypeMetrics(image,draw_info,&metrics,exception);
-  if ((draw_info->gravity != UndefinedGravity) &&
-      (draw_info->direction != RightToLeftDirection))
-    image->page.x=(ssize_t) (metrics.bounds.x1-draw_info->stroke_width/2.0);
-  else
-    {
-      (void) FormatLocaleString(geometry,MaxTextExtent,"%+g%+g",
-        -metrics.bounds.x1+draw_info->stroke_width/2.0,metrics.ascent+
-        draw_info->stroke_width/2.0);
-      if (draw_info->direction == RightToLeftDirection)
-        (void) FormatLocaleString(geometry,MaxTextExtent,"%+g%+g",
-          image->columns-(metrics.bounds.x2+draw_info->stroke_width/2.0),
-          metrics.ascent+draw_info->stroke_width/2.0);
-      draw_info->geometry=AcquireString(geometry);
-    }
-#if defined(MAGICKCORE_PANGOFT2_DELEGATE)
-  status=PangoImage(image_info,image,draw_info,exception);
-#else
-  status=AnnotateImage(image,draw_info,exception);
-#endif
+  pixels=(unsigned char *) RelinquishMagickMemory(pixels);
   draw_info=DestroyDrawInfo(draw_info);
   caption=DestroyString(caption);
-  if (status == MagickFalse)
-    {
-      image=DestroyImageList(image);
-      return((Image *) NULL);
-    }
   return(GetFirstImageInList(image));
 }
+#endif
 \f
 /*
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -534,7 +463,7 @@ static Image *ReadPANGOImage(const ImageInfo *image_info,
 %                                                                             %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
-%  RegisterPANGOImage() adds attributes for the PANGO image format to
+%  RegisterPANGOImage() adds attributes for the Pango Markup Language format to
 %  the list of supported formats.  The attributes include the image format
 %  tag, a method to read and/or write the format, whether the format
 %  supports the saving of more than one frame to the same file or blob,
@@ -556,12 +485,14 @@ ModuleExport size_t RegisterPANGOImage(void)
 
   *version='\0';
 #if defined(PANGO_VERSION_STRING)
-  (void) FormatLocaleString(version,MaxTextExtent,"Pangoft2 %s",
+  (void) FormatLocaleString(version,MaxTextExtent,"Pangocairo %s",
     PANGO_VERSION_STRING);
 #endif
   entry=SetMagickInfo("PANGO");
+#if defined(MAGICKCORE_PANGOCAIRO_DELEGATE)
   entry->decoder=(DecodeImageHandler *) ReadPANGOImage;
-  entry->description=ConstantString("Caption");
+#endif
+  entry->description=ConstantString("Pango Markup Language");
   if (*version != '\0')
     entry->version=ConstantString(version);
   entry->adjoin=MagickFalse;
@@ -581,8 +512,8 @@ ModuleExport size_t RegisterPANGOImage(void)
 %                                                                             %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
-%  UnregisterPANGOImage() removes format registrations made by the
-%  PANGO module from the list of supported formats.
+%  UnregisterPANGOImage() removes format registrations made by the Pango module
+%  from the list of supported formats.
 %
 %  The format of the UnregisterPANGOImage method is:
 %