Changeset 8422

Timestamp:

06/22/12 13:34:15 (11 months ago)

Author:

cristy

Message:

 

File:

• ImageMagick/branches/ImageMagick-6/magick/annotate.c (modified) (3 diffs)

ImageMagick/branches/ImageMagick-6/magick/annotate.c

@@ -1291 +1291 @@
       {
         if (draw_info->kerning != 0.0)
-          origin.x+=64.0*direction*draw_info->kerning;
+          origin.x+=(FT_Pos) (64.0*direction*draw_info->kerning);
         else
           if (FT_HAS_KERNING(face))
@@ -1301 +1301 @@
                 ft_kerning_default,&kerning);
               if (status == 0)
-                origin.x+=direction*kerning.x;
+                origin.x+=(FT_Pos) (direction*kerning.x);
             }
         }
@@ -1451 +1451 @@
         (IsUTFSpace(GetUTFCode(p)) != MagickFalse) &&
         (IsUTFSpace(code) == MagickFalse))
-      origin.x+=64.0*direction*draw_info->interword_spacing;
+      origin.x+=(FT_Pos) (64.0*direction*draw_info->interword_spacing);
     else
-      origin.x+=direction*face->glyph->advance.x;
+      origin.x+=(FT_Pos) (direction*face->glyph->advance.x);
     metrics->origin.x=origin.x;
     metrics->origin.y=origin.y;