avoid re-entrancy into giflib using the mutex API

[imager.git] / T1 / T1.pm

diff --git a/T1/T1.pm b/T1/T1.pm
index 25f9ae363d3d640b7ea81d74b9452e6ff946ead9..d0b444f4e9884791a9f7b19c08d8a5f0f97464aa 100644 (file)
--- a/T1/T1.pm
+++ b/T1/T1.pm
@@ -5,17 +5,10 @@ use vars qw(@ISA $VERSION);
 @ISA = qw(Imager::Font);
 
 BEGIN {
 @ISA = qw(Imager::Font);
 
 BEGIN {

-  $VERSION = "1.013";
-
-  eval {
-    require XSLoader;
-    XSLoader::load('Imager::Font::T1', $VERSION);
-    1;
-  } or do {
-    require DynaLoader;
-    push @ISA, 'DynaLoader';
-    bootstrap Imager::Font::T1 $VERSION;
-  };
+  $VERSION = "1.019";
+
+  require XSLoader;
+  XSLoader::load('Imager::Font::T1', $VERSION);

 }
 
 
 }
 
 


@@ -35,7 +28,7 @@ sub t1_set_aa_level {
 
 sub new {
   my $class = shift;
 
 sub new {
   my $class = shift;

-  my %hsh=(color=>Imager::Color->new(255,0,0,0),
+  my %hsh=(color=>Imager::Color->new(255,0,0,255),

           size=>15,
           @_);
 
           size=>15,
           @_);
 


@@ -74,7 +67,7 @@ sub new {
 
   my $id = i_t1_new($hsh{file},$hsh{afm});
   unless ($id >= 0) { # the low-level code may miss some error handling
 
   my $id = 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)";
+    Imager->_set_error(Imager->_error_as_msg);

     return;
   }
   return bless {
     return;
   }
   return bless {