[Templates-cvs] cvs commit: Template2/lib/Template/Plugin Image.pm

[cvs@template-toolkit.org]

cvs         06/01/30 14:41:16

  Modified:    lib/Template/Plugin Image.pm
  Log:
  * added code to allow file to be specified in 'file' option
  
  Revision  Changes    Path
  1.16      +5 -5      Template2/lib/Template/Plugin/Image.pm
  
  Index: Image.pm
  ===================================================================
  RCS file: /template-toolkit/Template2/lib/Template/Plugin/Image.pm,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- Image.pm	2005/11/29 07:37:48	1.15
  +++ Image.pm	2006/01/30 14:41:15	1.16
  @@ -13,7 +13,7 @@
   #   modify it under the same terms as Perl itself.
   #
   # REVISION
  -#   $Id: Image.pm,v 1.15 2005/11/29 07:37:48 abw Exp $
  +#   $Id: Image.pm,v 1.16 2006/01/30 14:41:15 abw Exp $
   #
   #============================================================================
   
  @@ -31,7 +31,7 @@
   use base qw( Template::Plugin );
   use vars qw( $VERSION $AUTOLOAD );
   
  -$VERSION = sprintf("%d.%02d", q$Revision: 1.15 $ =~ /(\d+)\.(\d+)/);
  +$VERSION = sprintf("%d.%02d", q$Revision: 1.16 $ =~ /(\d+)\.(\d+)/);
   
   BEGIN {
       if (eval { require Image::Info; }) {
  @@ -85,7 +85,7 @@
           $file = File::Spec->catfile($root, $name);
       }
       else {
  -        $file = $name;
  +        $file = defined $config->{file} ? $config->{file} : $name;
       }
   
       # Make a note of whether we are using Image::Size or
  @@ -410,8 +410,8 @@
   
   =head1 VERSION
   
  -1.13, distributed as part of the
  -Template Toolkit version 2.13, released on 30 January 2004.
  +1.15, distributed as part of the
  +Template Toolkit version 2.15, released on 27 January 2006.
   
   =head1 COPYRIGHT