eliminate use vars

[imager.git] / lib / Imager / Font / Type1.pm

diff --git a/lib/Imager/Font/Type1.pm b/lib/Imager/Font/Type1.pm
index 26687d2f247491660ed1f4beab9bb12371f150ef..c53041ee0ed1d6255c48fdf0e1918767e6f06e29 100644 (file)
--- a/lib/Imager/Font/Type1.pm
+++ b/lib/Imager/Font/Type1.pm
@@ -1,94 +1,11 @@
 package Imager::Font::Type1;
+use 5.006;
 use strict;
-use Imager::Color;
-use vars qw(@ISA);
-@ISA = qw(Imager::Font);
+use Imager::Font::T1;
 
-my $t1aa;
+our @ISA = qw(Imager::Font::T1);
 
-# $T1AA is in there because for some reason (probably cache related) antialiasing
-# is a system wide setting in t1 lib.
-
-sub t1_set_aa_level {
-  if (!defined $t1aa or $_[0] != $t1aa) {
-    Imager::i_t1_set_aa($_[0]);
-    $t1aa=$_[0];
-  }
-}
-
-sub new {
-  my $class = shift;
-  my %hsh=(color=>Imager::Color->new(255,0,0,0),
-          size=>15,
-          @_);
-
-  unless ($hsh{file}) {
-    $Imager::ERRSTR = "No font file specified";
-    return;
-  }
-  unless (-e $hsh{file}) {
-    $Imager::ERRSTR = "Font file $hsh{file} not found";
-    return;
-  }
-  unless ($Imager::formats{t1}) {
-    $Imager::ERRSTR = "Type 1 fonts not supported in this build";
-    return;
-  }
-  unless ($hsh{file} =~ m!^/! || $hsh{file} =~ m!^\./!) {
-    $hsh{file} = './' . $hsh{file};
-  }
-
-  if($hsh{afm}) {
-         unless (-e $hsh{afm}) {
-           $Imager::ERRSTR = "Afm file $hsh{afm} not found";
-           return;
-         }
-         unless ($hsh{afm} =~ m!^/! || $hsh{afm} =~ m!^\./!) {
-           $hsh{file} = './' . $hsh{file};
-         }
-  } else {
-         $hsh{afm} = 0;
-  }
-
-  my $id = Imager::i_t1_new($hsh{file},$hsh{afm});
-  unless ($id >= 0) { # the low-level code may miss some error handling
-    $Imager::ERRSTR = "Could not load font ($id)";
-    return;
-  }
-  return bless {
-               id    => $id,
-               aa    => $hsh{aa} || 0,
-               file  => $hsh{file},
-               type  => 't1',
-               size  => $hsh{size},
-               color => $hsh{color},
-              }, $class;
-}
-
-sub _draw {
-  my $self = shift;
-  my %input = @_;
-  t1_set_aa_level($input{aa});
-  if (exists $input{channel}) {
-    Imager::i_t1_cp($input{image}{IMG}, $input{'x'}, $input{'y'},
-                   $input{channel}, $self->{id}, $input{size},
-                   $input{string}, length($input{string}), $input{align});
-  } else {
-    Imager::i_t1_text($input{image}{IMG}, $input{'x'}, $input{'y'}, 
-                     $input{color}, $self->{id}, $input{size}, 
-                     $input{string}, length($input{string}), 
-                     $input{align});
-  }
-
-  return $self;
-}
-
-sub _bounding_box {
-  my $self = shift;
-  my %input = @_;
-  return Imager::i_t1_bbox($self->{id}, $input{size}, $input{string},
-                          length($input{string}));
-}
+our $VERSION = "1.013";
 
 1;
 
@@ -96,20 +13,15 @@ __END__
 
 =head1 NAME
 
-  Imager::Font::Type1 - low-level functions for Type1 fonts
+  Imager::Font::Type1 - low-level functions for T1Lib text output
 
 =head1 DESCRIPTION
 
-Imager::Font creates a Imager::Font::Type1 object when asked to create
-a font object based on a .pfb file.
-
-See Imager::Font to see how to use this type.
-
-This class provides low-level functions that require the caller to
-perform data validation
+This is a simple wrapper around Imager::Font::T1 for backwards
+compatibility.
 
 =head1 AUTHOR
 
-Addi, Tony
+Tony Cook <tonyc@cpan.org>
 
 =cut