• R/O
  • SSH

GM: Commit

Main GraphicsMagick source repository


Commit MetaInfo

Revision79f4cd4e6836f4105968001e426498fbae6e7bfe (tree)
Time2000-01-11 04:29:36
AuthorJohn Cristy <duc.sequere.aut.de.via.decede@gmai...>
CommiterJohn Cristy

Log Message

*** empty log message ***

Change Summary

Incremental Difference

diff -r 717a7bb60cce -r 79f4cd4e6836 PerlMagick/t/ttf/read.t
--- a/PerlMagick/t/ttf/read.t Sun Jan 09 18:34:58 2000 -0600
+++ b/PerlMagick/t/ttf/read.t Mon Jan 10 13:29:36 2000 -0600
@@ -27,7 +27,7 @@
2727 ++$test;
2828 print("Draw text using font ...\n");
2929 $infile = 'input.ttf';
30-$md5 = '886fe1492fb466210e91566f5d314e04';
30+$md5 = '729377f88d2dfcef65d2e07c1ea62274';
3131 $md5_16 = 'df41d2a022b6b0cc79923a52ba33d834';
3232
3333 $image=Image::Magick->new;
diff -r 717a7bb60cce -r 79f4cd4e6836 magick/label.c
--- a/magick/label.c Sun Jan 09 18:34:58 2000 -0600
+++ b/magick/label.c Mon Jan 10 13:29:36 2000 -0600
@@ -485,18 +485,13 @@
485485 }
486486 TT_Get_Face_Properties(face,&face_properties);
487487 TT_Get_Instance_Metrics(instance,&instance_metrics);
488- canvas.width=2;
488+ canvas.width=4;
489489 for (i=0; i < length; i++)
490490 {
491491 if (glyphs[unicode[i]].z == (TT_Glyph *) NULL)
492492 continue;
493493 TT_Get_Glyph_Metrics(glyphs[unicode[i]],&glyph_metrics);
494- if (i == (length-1))
495- {
496- canvas.width+=(glyph_metrics.bbox.xMin+glyph_metrics.bbox.xMax)/64;
497- continue;
498- }
499- canvas.width+=glyph_metrics.advance/64;
494+ canvas.width+=(glyph_metrics.advance >> 6)+1;
500495 }
501496 canvas.width=(canvas.width+3) & -4;
502497 canvas.rows=instance_metrics.y_ppem*(face_properties.horizontal->Ascender-
diff -r 717a7bb60cce -r 79f4cd4e6836 magick/ttf.c
--- a/magick/ttf.c Sun Jan 09 18:34:58 2000 -0600
+++ b/magick/ttf.c Mon Jan 10 13:29:36 2000 -0600
@@ -56,11 +56,6 @@
5656 #include "defines.h"
5757
5858 #if defined(HasTTF)
59-#if defined(HAVE_FREETYPE_FREETYPE_H)
60-#include "freetype/freetype.h"
61-#else
62-#include "freetype.h"
63-#endif
6459 /*
6560 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
6661 % %
Show on old repository browser