commit 14c8ae4cf8fdcb1c1ed0f8fd1a5c3290414fe733
author Cristy <urban-warrior@imagemagick.org> Wed Dec 23 15:51:51 2015 -0500
committer Cristy <urban-warrior@imagemagick.org> Wed Dec 23 15:51:51 2015 -0500
tree 90cb8e65edd61844c344ef4c50c40e19baa9ee27
parent 91c2741e03e3e692f6fe04eb02d059edbc0edb90

Source code clean-up

MagickCore/annotate.c

diff --git a/MagickCore/annotate.c b/MagickCore/annotate.c
index 7c7dd75..fa76fb8 100644
--- a/MagickCore/annotate.c
+++ b/MagickCore/annotate.c
@@ -1021,10 +1021,13 @@
 
 #if defined(MAGICKCORE_FREETYPE_DELEGATE)
 
-static size_t ComplexTextLayout(const char *text,const ssize_t size,
+static size_t ComplexTextLayout(const char *text,const size_t length,
   const FT_Face face,const raqm_direction_t direction,const double kerning,
   const FT_Int32 flags,raqm_glyph_info_t **grapheme)
 {
+#if defined(MAGICKCORE_CTL_DELEGATE)
+  return(raqm_shape(text,length,face,direction,&grapheme));
+#else
   FT_Error
     ft_status;
 
@@ -1037,7 +1040,7 @@
   /*
     Simple layout for bi-direction text (right-to-left or left-to-right).
   */
-  *grapheme=(raqm_glyph_info_t *) AcquireQuantumMemory(size+1,
+  *grapheme=(raqm_glyph_info_t *) AcquireQuantumMemory(length+1,
     sizeof(**grapheme));
   if (*grapheme == (raqm_glyph_info_t *) NULL)
     return(0);
@@ -1069,6 +1072,7 @@
     last_glyph=(*grapheme)[i].index;
   }
   return((size_t) i);
+#endif
 }
 
 static int TraceCubicBezier(FT_Vector *p,FT_Vector *q,FT_Vector *to,
@@ -1425,12 +1429,8 @@
     if (draw_info->direction == LeftToRightDirection)
       direction=RAQM_DIRECTION_LTR;
   grapheme=(raqm_glyph_info_t *) NULL;
-#if defined(MAGICKCORE_CTL_DELEGATE)
-  length=(size_t) raqm_shape(p,strlen(p),face,direction,&grapheme);
-#else
   length=ComplexTextLayout(p,strlen(p),face,direction,draw_info->kerning,flags,
     &grapheme);
-#endif
   code=0;
   for (i=0; i < (ssize_t) length; i++)
   {