pick up im_ prefix functions too

[imager.git] / Imager.pm

diff --git a/Imager.pm b/Imager.pm
index 6261a0cc505decde4a59a956029e25e14adb490b..d84171459d396bc652c942f3f622dc371110a539 100644 (file)
--- a/Imager.pm
+++ b/Imager.pm
@@ -24,11 +24,6 @@ use Imager::Font;
                i_color_set
                i_color_info
 
                i_color_set
                i_color_info
 

-               i_img_empty
-               i_img_empty_ch
-               i_img_exorcise
-               i_img_destroy
-

                i_img_info
 
                i_img_setmask
                i_img_info
 
                i_img_setmask


@@ -148,7 +143,7 @@ BEGIN {
   if ($ex_version < 5.57) {
     @ISA = qw(Exporter);
   }
   if ($ex_version < 5.57) {
     @ISA = qw(Exporter);
   }

-  $VERSION = '0.90';
+  $VERSION = '0.93';

   require XSLoader;
   XSLoader::load(Imager => $VERSION);
 }
   require XSLoader;
   XSLoader::load(Imager => $VERSION);
 }


@@ -913,8 +908,8 @@ sub img_set {
     $self->{IMG} = i_img_16_new($hsh{xsize}, $hsh{ysize}, $hsh{channels});
   }
   else {
     $self->{IMG} = i_img_16_new($hsh{xsize}, $hsh{ysize}, $hsh{channels});
   }
   else {

-    $self->{IMG}=Imager::ImgRaw::new($hsh{'xsize'}, $hsh{'ysize'},
-                                     $hsh{'channels'});
+    $self->{IMG}= i_img_8_new($hsh{'xsize'}, $hsh{'ysize'},
+                             $hsh{'channels'});

   }
 
   unless ($self->{IMG}) {
   }
 
   unless ($self->{IMG}) {


@@ -1605,10 +1600,11 @@ sub _load_file {
       return 1;
     }
     else {
       return 1;
     }
     else {

-      my $work = $@ || "Unknown error loading $file";
+      my $work = $@ || "Unknown error";

       chomp $work;
       $work =~ s/\n?Compilation failed in require at .*Imager\.pm line .*\z//m;
       $work =~ s/\n/\\n/g;
       chomp $work;
       $work =~ s/\n?Compilation failed in require at .*Imager\.pm line .*\z//m;
       $work =~ s/\n/\\n/g;

+      $work =~ s/\s*\.?\z/ loading $file/;

       $file_load_errors{$file} = $work;
       $$error = $work;
       return 0;
       $file_load_errors{$file} = $work;
       $$error = $work;
       return 0;


@@ -2631,7 +2627,7 @@ sub rotate {
     }
   }
   elsif (defined $opts{radians} || defined $opts{degrees}) {
     }
   }
   elsif (defined $opts{radians} || defined $opts{degrees}) {

-    my $amount = $opts{radians} || $opts{degrees} * 3.1415926535 / 180;
+    my $amount = $opts{radians} || $opts{degrees} * 3.14159265358979 / 180;

 
     my $back = $opts{back};
     my $result = Imager->new;
 
     my $back = $opts{back};
     my $result = Imager->new;


@@ -3421,18 +3417,35 @@ sub getsamples {
 
 sub setsamples {
   my $self = shift;
 
 sub setsamples {
   my $self = shift;

-  my %opts = ( x => 0, offset => 0, @_ );

 
   unless ($self->{IMG}) {
     $self->_set_error('setsamples: empty input image');
     return;
   }
 
 
   unless ($self->{IMG}) {
     $self->_set_error('setsamples: empty input image');
     return;
   }
 

-  my $data = $opts{data};
-  unless(defined $data) {
+  my %opts = ( x => 0, offset => 0 );
+  my $data_index;
+  # avoid duplicating the data parameter, it may be a large scalar
+  my $i = 0;
+  while ($i < @_ -1) {
+    if ($_[$i] eq 'data') {
+      $data_index = $i+1;
+    }
+    else {
+      $opts{$_[$i]} = $_[$i+1];
+    }
+
+    $i += 2;
+  }
+
+  unless(defined $data_index) {

     $self->_set_error('setsamples: data parameter missing');
     return;
   }
     $self->_set_error('setsamples: data parameter missing');
     return;
   }

+  unless (defined $_[$data_index]) {
+    $self->_set_error('setsamples: data parameter not defined');
+    return;
+  }

 
   my $type = $opts{type};
   defined $type or $type = '8bit';
 
   my $type = $opts{type};
   defined $type or $type = '8bit';


@@ -3443,22 +3456,22 @@ sub setsamples {
   my $count;
   if ($type eq '8bit') {
     $count = i_psamp($self->{IMG}, $opts{x}, $opts{y}, $opts{channels},
   my $count;
   if ($type eq '8bit') {
     $count = i_psamp($self->{IMG}, $opts{x}, $opts{y}, $opts{channels},

-                    $data, $opts{offset}, $width);
+                    $_[$data_index], $opts{offset}, $width);

   }
   elsif ($type eq 'float') {
     $count = i_psampf($self->{IMG}, $opts{x}, $opts{y}, $opts{channels},
   }
   elsif ($type eq 'float') {
     $count = i_psampf($self->{IMG}, $opts{x}, $opts{y}, $opts{channels},

-                     $data, $opts{offset}, $width);
+                     $_[$data_index], $opts{offset}, $width);

   }
   elsif ($type =~ /^([0-9]+)bit$/) {
     my $bits = $1;
 
   }
   elsif ($type =~ /^([0-9]+)bit$/) {
     my $bits = $1;
 

-    unless (ref $data) {
+    unless (ref $_[$data_index]) {

       $self->_set_error("setsamples: data must be an array ref for type not 8bit or float");
       return;
     }
 
     $count = i_psamp_bits($self->{IMG}, $opts{x}, $opts{y}, $bits,
       $self->_set_error("setsamples: data must be an array ref for type not 8bit or float");
       return;
     }
 
     $count = i_psamp_bits($self->{IMG}, $opts{x}, $opts{y}, $bits,

-                         $opts{channels}, $data, $opts{offset}, 
+                         $opts{channels}, $_[$data_index], $opts{offset}, 

                          $width);
   }
   else {
                          $width);
   }
   else {


@@ -3585,6 +3598,7 @@ sub convert {
   $new->{IMG} = i_convert($self->{IMG}, $matrix);
   unless ($new->{IMG}) {
     # most likely a bad matrix
   $new->{IMG} = i_convert($self->{IMG}, $matrix);
   unless ($new->{IMG}) {
     # most likely a bad matrix

+    i_push_error(0, "convert");

     $self->{ERRSTR} = _error_as_msg();
     return undef;
   }
     $self->{ERRSTR} = _error_as_msg();
     return undef;
   }


@@ -3899,6 +3913,41 @@ sub get_file_limits {
   i_get_image_file_limits();
 }
 
   i_get_image_file_limits();
 }
 

+my @check_args = qw(width height channels sample_size);
+
+sub check_file_limits {
+  my $class = shift;
+
+  my %opts =
+    (
+     channels => 3,
+     sample_size => 1,
+     @_,
+    );
+
+  if ($opts{sample_size} && $opts{sample_size} eq 'float') {
+    $opts{sample_size} = length(pack("d", 0));
+  }
+
+  for my $name (@check_args) {
+    unless (defined $opts{$name}) {
+      $class->_set_error("check_file_limits: $name must be defined");
+      return;
+    }
+    unless ($opts{$name} == int($opts{$name})) {
+      $class->_set_error("check_file_limits: $name must be a positive integer");
+      return;
+    }
+  }
+
+  my $result = i_int_check_image_file_limits(@opts{@check_args});
+  unless ($result) {
+    $class->_set_error($class->_error_as_msg());
+  }
+
+  return $result;
+}
+

 # Shortcuts that can be exported
 
 sub newcolor { Imager::Color->new(@_); }
 # Shortcuts that can be exported
 
 sub newcolor { Imager::Color->new(@_); }


@@ -4328,6 +4377,10 @@ L<Imager::Inline> - using Imager's C API from Inline::C
 
 L<Imager::ExtUtils> - tools to get access to Imager's C API.
 
 
 L<Imager::ExtUtils> - tools to get access to Imager's C API.
 

+=item *
+
+L<Imager::Security> - brief security notes.
+

 =back
 
 =head2 Basic Overview
 =back
 
 =head2 Basic Overview


@@ -4397,6 +4450,8 @@ image
 
 box() - L<Imager::Draw/box()> - draw a filled or outline box.
 
 
 box() - L<Imager::Draw/box()> - draw a filled or outline box.
 

+check_file_limits() - L<Imager::Files/check_file_limits()>
+

 circle() - L<Imager::Draw/circle()> - draw a filled circle
 
 close_log() - L<Imager::ImageTypes/close_log()> - close the Imager
 circle() - L<Imager::Draw/circle()> - draw a filled circle
 
 close_log() - L<Imager::ImageTypes/close_log()> - close the Imager


@@ -4713,7 +4768,7 @@ matrix - L<Imager::Matrix2d>,
 L<Imager::Engines/"Matrix Transformations">,
 L<Imager::Font/transform()>
 
 L<Imager::Engines/"Matrix Transformations">,
 L<Imager::Font/transform()>
 

-metadata, image - L<Imager::ImageTypes/"Tags">
+metadata, image - L<Imager::ImageTypes/"Tags">, L<Image::ExifTool>

 
 mosaic - L<Imager::Filters/mosaic>
 
 
 mosaic - L<Imager::Filters/mosaic>
 


@@ -4747,6 +4802,8 @@ saving an image - L<Imager::Files>
 
 scaling - L<Imager::Transformations/scale()>
 
 
 scaling - L<Imager::Transformations/scale()>
 

+security - L<Imager::Security>
+

 SGI files - L<Imager::Files/"SGI (RGB, BW)">
 
 sharpen - L<Imager::Filters/unsharpmask>, L<Imager::Filters/conv>
 SGI files - L<Imager::Files/"SGI (RGB, BW)">
 
 sharpen - L<Imager::Filters/unsharpmask>, L<Imager::Filters/conv>


@@ -4915,6 +4972,8 @@ Other perl imaging modules include:
 L<GD>(3), L<Image::Magick>(3), L<Graphics::Magick>(3),
 L<Prima::Image>, L<IPA>.
 
 L<GD>(3), L<Image::Magick>(3), L<Graphics::Magick>(3),
 L<Prima::Image>, L<IPA>.
 

+For manipulating image metadata see L<Image::ExifTool>.
+

 If you're trying to use Imager for array processing, you should
 probably using L<PDL>.
 
 If you're trying to use Imager for array processing, you should
 probably using L<PDL>.