From: Cristy <urban-warrior@imagemagick.org>
Date: Sun, 10 Sep 2017 15:27:09 +0000 (-0400)
Subject: Use default font
X-Git-Tag: 7.0.7-2~8
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=49e1ed7e1cba038ef6ef6c9f871a4b9ad4f1d4b6;p=imagemagick

Use default font
---

diff --git a/PerlMagick/demo/annotate.pl b/PerlMagick/demo/annotate.pl
index 8b3b41d61..70d04555d 100644
--- a/PerlMagick/demo/annotate.pl
+++ b/PerlMagick/demo/annotate.pl
@@ -2,10 +2,6 @@
 
 use Image::Magick;
 
-#$font = '-adobe-helvetica-medium-r-normal--25-180-100-100-p-130-iso8729-1';
-#$font = 'Times';
-$font = 'Generic.ttf';
-
 $image = Image::Magick->new();
 $x = 100;
 $y = 100;
@@ -14,7 +10,7 @@ for ($angle=0; $angle < 360; $angle+=30)
   my ($label);
 
   print "angle $angle\n";
-  $label=Image::Magick->new(size=>"600x600",pointsize=>24,font=>$font);
+  $label=Image::Magick->new(size=>"600x600",pointsize=>24);
   $label->Read("xc:white");
   $label->Draw(primitive=>'line',points=>"300,100 300,500",stroke=>'#600');
   $label->Draw(primitive=>'line',points=>"100,300 500,300",stroke=>'#600');
diff --git a/PerlMagick/demo/button.pl b/PerlMagick/demo/button.pl
index 84c6b575d..c0c766c3f 100644
--- a/PerlMagick/demo/button.pl
+++ b/PerlMagick/demo/button.pl
@@ -9,7 +9,6 @@ $q->Set(size=>'30x106');
 $q->Read('gradient:#00f685-#0083f8');
 $q->Rotate(-90);
 $q->Raise('6x6');
-$q->Annotate(text=>'Push Me',font=>'Generic.ttf',fill=>'black',
-  gravity=>'Center',pointsize=>18);
+$q->Annotate(text=>'Push Me',fill=>'black',gravity=>'Center',pointsize=>18);
 $q->Write('button.gif');
 $q->Write('win:');
diff --git a/PerlMagick/demo/composite.pl b/PerlMagick/demo/composite.pl
index 9f0e0a7b7..987be1154 100644
--- a/PerlMagick/demo/composite.pl
+++ b/PerlMagick/demo/composite.pl
@@ -2,10 +2,6 @@
 
 use Image::Magick;
 
-#$font = '-adobe-helvetica-medium-r-normal--25-180-100-100-p-130-iso8729-1';
-#$font = 'Times';
-$font = 'Generic.ttf';
-
 $image = Image::Magick->new();
 $smile = Image::Magick->new();
 $smile->Read('smile.gif');
@@ -17,8 +13,7 @@ for ($angle=0; $angle < 360; $angle+=30)
   my ($thumbnail);
 
   print "angle $angle\n";
-  $thumbnail=Image::Magick->new(size=>"600x600",pointsize=>24,font=>$font,
-    fill=>'black');
+  $thumbnail=Image::Magick->new(size=>"600x600",pointsize=>24,fill=>'black');
   $thumbnail->Read("xc:white");
   $thumbnail->Draw(primitive=>'line',points=>"300,100 300,500",stroke=>'#600');
   $thumbnail->Draw(primitive=>'line',points=>"100,300 500,300",stroke=>'#600');
diff --git a/PerlMagick/demo/demo.pl b/PerlMagick/demo/demo.pl
index 6c204f65c..6c1c7712e 100644
--- a/PerlMagick/demo/demo.pl
+++ b/PerlMagick/demo/demo.pl
@@ -63,8 +63,8 @@ push(@$images,$example);
 print "Annotate...\n";
 $example=$model->Clone();
 $example->Label('Annotate');
-$example->Annotate(text=>'Magick',geometry=>'+0+20',font=>'Generic.ttf',
-  fill=>'gold',gravity=>'North',pointsize=>14);
+$example->Annotate(text=>'Magick',geometry=>'+0+20',fill=>'gold',
+  gravity=>'North',pointsize=>14);
 push(@$images,$example);
 
 print "Auto-gamma...\n";
@@ -504,8 +504,8 @@ push(@$images,$example);
 #
 print "Montage...\n";
 $montage=$images->Montage(geometry=>'128x160+8+4>',gravity=>'Center',
-  tile=>'5x+10+200',compose=>'over',background=>'#ffffff',font=>'Generic.ttf',
-  pointsize=>18,fill=>'#600',stroke=>'none',shadow=>'true');
+  tile=>'5x+10+200',compose=>'over',background=>'#ffffff',pointsize=>18,
+  fill=>'#600',stroke=>'none',shadow=>'true');
 
 $logo=Image::Magick->new();
 $logo->Read('logo:');
diff --git a/PerlMagick/demo/piddle.pl b/PerlMagick/demo/piddle.pl
index eb0269027..1d2600fda 100644
--- a/PerlMagick/demo/piddle.pl
+++ b/PerlMagick/demo/piddle.pl
@@ -59,8 +59,8 @@ $image->Draw(primitive=>'line',points=>'200,260 260,260',stroke=>green,
 #
 # Draw text.
 #
-$image->Annotate(text=>'This is a test!',geometry=>'+30+140',
-  font=>'Generic.ttf',fill=>'green',pointsize=>24,rotate=>45.0);
+$image->Annotate(text=>'This is a test!',geometry=>'+30+140',fill=>'green',
+  pointsize=>24,rotate=>45.0);
 $image->Write('piddle.gif');
 $image->Write('piddle.mvg');
 $image->Write('win:');
diff --git a/PerlMagick/demo/shadow-text.pl b/PerlMagick/demo/shadow-text.pl
index 1ee2cd44b..42a541d7a 100644
--- a/PerlMagick/demo/shadow-text.pl
+++ b/PerlMagick/demo/shadow-text.pl
@@ -6,10 +6,10 @@ use Image::Magick;
 
 $image=Image::Magick->new(size=>'500x120');
 $image->Read('xc:white');
-$image->Annotate(font=>'Generic.ttf',fill=>'rgba(100,100,100,0.8)',
-  pointsize=>60, text=>'Works like magick!',geometry=>'+30+90');
+$image->Annotate(fill=>'rgba(100,100,100,0.8)',pointsize=>60,
+   text=>'Works like magick!',geometry=>'+30+90');
 $image->Blur('0x1');
-$image->Annotate(font=>'Generic.ttf',fill=>'red',stroke=>'blue',pointsize=>60,
+$image->Annotate(fill=>'red',stroke=>'blue',pointsize=>60,
   text=>'Works like magick!',geometry=>'+26+86');
 $image->Write('shadow.gif');
 $image->Write('win:');
diff --git a/PerlMagick/demo/shapes.pl b/PerlMagick/demo/shapes.pl
index cf7e1a901..56692fb2a 100644
--- a/PerlMagick/demo/shapes.pl
+++ b/PerlMagick/demo/shapes.pl
@@ -25,12 +25,12 @@ $image->FloodfillPaint(geometry=>'+132+62',fill=>'blue',bordercolor=>'black',
 #
 # Draw text.
 #
-$image->Annotate(fill=>'red',geometry=>'+150+20',font=>'Generic.ttf',
-  pointsize=>18,text=>'Hello world!');
-$image->Annotate(fill=>'blue',geometry=>'+150+38',font=>'Generic.ttf',
-  pointsize=>14,text=>'Goodbye cruel world!');
-$image->Annotate(fill=>'black',geometry=>'+280+120',font=>'Generic.ttf',
-  pointsize=>14,text=>"I'm climbing the wall!",rotate=>90.0);
+$image->Annotate(fill=>'red',geometry=>'+150+20',pointsize=>18,
+  text=>'Hello world!');
+$image->Annotate(fill=>'blue',geometry=>'+150+38',pointsize=>14,
+  text=>'Goodbye cruel world!');
+$image->Annotate(fill=>'black',geometry=>'+280+120',pointsize=>14,
+  text=>"I'm climbing the wall!",rotate=>90.0);
 #
 # Write image.
 #