xt/author/critic.t xt/perlcriticrc @@ -1,5 +1,8 @@ Revision history for Perl extension Image::TextMode. +0.06 XXX + - conform to Perl::Critic policies + 0.05 Fri Feb 13 2009 - tidy up ANSI and ANSIMation write() to only write the columns needed - add basic RLE encoding to ANSI and ANSIMation write() Changes @@ -3,7 +3,7 @@ package Image::TextMode; use strict; use warnings; -our $VERSION = '0.05'; +our $VERSION = '0.06'; =head1 NAME lib/Image/TextMode.pm @@ -1,12 +1,11 @@ package Image::TextMode::Animation; use Moose; -require Class::MOP; +use Symbol (); BEGIN { for my $sub ( qw( getpixel getpixel_obj putpixel clear_screen clear_line ) ) { - no strict 'refs'; - *{ __PACKAGE__ . "\::$sub" } = sub { + *{ Symbol::qualify_to_ref( __PACKAGE__ . "\::$sub" ) } = sub { shift->frames->[ -1 ]->$sub( @_ ); } } @@ -16,6 +15,11 @@ BEGIN { Image::TextMode::Animation - A base class for text mode animation file formats +=head1 DESCRIPTION + +This class should be used for any format that requires a sequence of frames +for display. + =head1 ACCESSORS =over 4 lib/Image/TextMode/Animation.pm @@ -8,6 +8,11 @@ use Image::TextMode::Pixel; Image::TextMode::Canvas - A canvas of text mode pixels +=head1 DESCRIPTION + +This module represents the graphical portion of an image, i.e. a grid +of pixels. + =head1 ACCESSORS =over 4 lib/Image/TextMode/Canvas.pm @@ -1,4 +1,4 @@ -package Image::TextMode::Font::8x16; +package Image::TextMode::Font::8x16; ## no critic (Modules::RequireFilenameMatchesPackage) use Moose; lib/Image/TextMode/Font/8x16.pm @@ -1,4 +1,4 @@ -package Image::TextMode::Font::8x8; +package Image::TextMode::Font::8x8; ## no critic (Modules::RequireFilenameMatchesPackage) use Moose; lib/Image/TextMode/Font/8x8.pm @@ -12,6 +12,12 @@ use Image::TextMode::Canvas; Image::TextMode::Format - A base class for text mode file formats +=head1 DESCRIPTION + +This is a base class for all textmode formats. It provides the basic +structure for reading and writing, plus provides some defaults for +common attributes (e.g. font and palette). + =head1 ACCESSORS =over 4 @@ -56,14 +62,14 @@ sub _build_writer { sub _xs_or_not { my ( $class, $type ) = @_; - ( my $result = ( ref $class || $class ) ) =~ s{\bFormat\b}{$type}; + ( my $name = ( ref $class || $class ) ) =~ s{\bFormat\b}{$type}s; - my $xs = $result . '::XS'; - eval { Class::MOP::load_class( $xs ); }; - return $xs->new if !$@; + my $xs = $name. '::XS'; + my $result = eval { Class::MOP::load_class( $xs ); }; + if( $result && !$@ ) { return $xs->new; } - Class::MOP::load_class( $result ); - return $result->new; + Class::MOP::load_class( $name ); + return $name->new; } has 'font' => ( @@ -100,7 +106,7 @@ Proxies to the reader's C<read()> method. =cut -sub read { +sub read { ## no critic (Subroutines::ProhibitBuiltinHomonyms) my ( $self, @rest ) = @_; $self->reader->read( $self, @rest ); } @@ -111,7 +117,7 @@ Proxies to the writer's C<write()> method. =cut -sub write { +sub write { ## no critic (Subroutines::ProhibitBuiltinHomonyms) my ( $self, @rest ) = @_; $self->writer->write( $self, @rest ); } lib/Image/TextMode/Format.pm @@ -18,6 +18,11 @@ __PACKAGE__->meta->make_immutable; Image::TextMode::Format::ANSI - read and write ANSI files +=head1 DESCRIPTION + +ANSI is a text-based image format that uses escape sequences to give the +parser a particular command. + =head1 METHODS =head2 new( %args ) lib/Image/TextMode/Format/ANSI.pm @@ -18,6 +18,13 @@ __PACKAGE__->meta->make_immutable; Image::TextMode::Format::ANSIMation - read and write ANSIMation files +=head1 DESCRIPTION + +ANSIMation is an pseudo-format whereby the ANSI is displayed at a slow +enough rate so that it appears to animate the image. This module simulates +this by assuming a C<position(0,0)> command is the start of a new "frame" in +the sequence. + =head1 METHODS =head2 new( %args ) lib/Image/TextMode/Format/ANSIMation.pm @@ -14,6 +14,13 @@ __PACKAGE__->meta->make_immutable; Image::TextMode::Format::Bin - read and write Bin files +=head1 DESCRIPTION + +The Bin format is essentially a raw VGA video dump. It is a sequence of +character and attribute byte pairs. It holds no width information, so any +images over 80 columns will have to be described in an alternate way (i.e. +via SAUCE metadata). + =head1 METHODS =head2 new( %args ) lib/Image/TextMode/Format/Bin.pm @@ -21,6 +21,10 @@ __PACKAGE__->meta->make_immutable; Image::TextMode::Format::IDF - read and write IDF files +=head1 DESCRIPTION + +The IDF format. + =head1 ACCESSORS =over 4 lib/Image/TextMode/Format/IDF.pm @@ -22,6 +22,10 @@ __PACKAGE__->meta->make_immutable; Image::TextMode::Format::Tundra - read and write Tundra files +=head1 DESCRIPTION + +The Tundra format. + =head1 ACCESSORS =over 4 lib/Image/TextMode/Format/Tundra.pm @@ -6,6 +6,8 @@ use warnings; use Module::Pluggable::Object; use Image::TextMode::SAUCE; +use Carp 'croak'; + sub load { my ( $self, @files ) = @_; my @result; @@ -25,16 +27,16 @@ sub load { ( $file, $read_options ) = @$file; } - my( $ext ) = $file =~ m{([^.]+?)$}; + my( $ext ) = $file =~ m{([^.]+?)$}s; $ext = lc $ext; my $format = $exts{ $ext } || $default; # if we get ANSI, we need to see if it's ansimation or not from the SAUCE data. if( $format eq $default ) { my $sauce = Image::TextMode::SAUCE->new; - open( my $fh, $file ); + open( my $fh, '<', $file ) or croak "Unable to read SAUCE data for '$file': $!"; $sauce->read( $fh ); - close( $fh ); + close( $fh ) or croak "Unable to close '$file': $!"; if( $sauce->has_sauce && $sauce->filetype eq 'ANSiMation' ) { $format = 'Image::TextMode::Format::ANSIMation'; } @@ -56,6 +58,11 @@ Image::TextMode::Loader - Load text mode images by best-guess my $img = Image::TextMode::Loader->load( $filename ); +=head1 DESCRIPTION + +This module allows you to load a set of images without having to explicitly +specify the format before-hand. + =head1 METHODS =head2 load( @files ) lib/Image/TextMode/Loader.pm @@ -71,13 +71,14 @@ should it exist. =cut sub BUILDARGS { - my $class = shift; + my( $class, @rest ) = @_; + my $options = {}; - if ( @_ % 2 != 0 ) { - $options = pop; + if ( @rest % 2 != 0 ) { + $options = pop @rest; } - my %args = @_; + my %args = @rest; my $attr = delete $args{ attr }; if ( $attr ) { lib/Image/TextMode/Pixel.pm @@ -2,10 +2,16 @@ package Image::TextMode::Reader; use Moose; +use Carp 'croak'; + =head1 NAME Image::TextMode::Reader - A base class for file readers +=head1 DESCRIPTION + +This module provides some of the basic functionality for all reader classes. + =head1 METHODS =head2 new( %args ) @@ -19,7 +25,7 @@ method. =cut -sub read { +sub read { ## no critic (Subroutines::ProhibitBuiltinHomonyms) my ( $self, $image, $fh, $options ) = @_; $options ||= {}; $fh = _get_fh( $fh ); @@ -41,7 +47,7 @@ sub _get_fh { my $fh = $file; if ( !ref $fh ) { undef $fh; - open $fh, $file; + open $fh, '<', $file or croak "Unable to open '$file': $!"; ## no critic (InputOutput::RequireBriefOpen) } binmode( $fh ); lib/Image/TextMode/Reader.pm @@ -82,6 +82,10 @@ __PACKAGE__->meta->make_immutable; Image::TextMode::Reader::ADF - Reads ADF files +=head1 DESCRIPTION + +Provides reading capabilities for the ADF format. + =head1 AUTHOR Brian Cassidy E<lt>bricas@cpan.orgE<gt> lib/Image/TextMode/Reader/ADF.pm @@ -1,6 +1,7 @@ package Image::TextMode::Reader::ANSI; use Moose; +use charnames ':full'; extends 'Image::TextMode::Reader'; @@ -49,10 +50,10 @@ sub _read { while ( read( $fh, $ch, 1 ) ) { my $state = $self->state; if ( $state == $S_TXT ) { - if ( $ch eq "\x1a" ) { + if ( $ch eq "\N{SUBSTITUTE}" ) { $self->state( $S_END ); } - elsif ( $ch eq "\x1b" ) { + elsif ( $ch eq "\N{ESCAPE}" ) { $self->state( $S_CHK_B ); } elsif ( $ch eq "\n" ) { @@ -80,8 +81,8 @@ sub _read { } } elsif ( $state == $S_WAIT_LTR ) { - if ( $ch =~ /[a-zA-Z]/ ) { - my @args = split( /;/, $argbuf ); + if ( $ch =~ /[a-zA-Z]/s ) { + my @args = split( /;/s, $argbuf ); if ( $ch eq 'm' ) { $self->set_attributes( @args ); @@ -133,9 +134,9 @@ sub _read { } sub set_position { - my $self = shift; - my $y = ( shift || 1 ) - 1; - my $x = ( shift || 1 ) - 1; + my( $self, $y, $x ) = @_; + $y = ( $y || 1 ) - 1; + $x = ( $x || 1 ) - 1; $y = 0 if $y < 0; $x = 0 if $x < 0; @@ -145,8 +146,7 @@ sub set_position { } sub set_attributes { - my $self = shift; - my @args = @_; + my( $self, @args ) = @_; foreach ( @args ) { if ( $_ == 0 ) { @@ -287,6 +287,10 @@ __PACKAGE__->meta->make_immutable; Image::TextMode::Reader::ANSI - Reads ANSI files +=head1 DESCRIPTION + +Provides reading capabilities for the ANSI format. + =head1 ACCESSORS =over 4 lib/Image/TextMode/Reader/ANSI.pm @@ -6,26 +6,26 @@ use Image::TextMode::Canvas; extends 'Image::TextMode::Reader::ANSI'; sub _read { - my( $self, $animation ) = ( shift, shift ); + my( $self, $animation, @args ) = @_; $animation->add_frame( Image::TextMode::Canvas->new ); - $self->SUPER::_read( $animation, @_ ); + $self->SUPER::_read( $animation, @args ); } sub set_position { - my $self = shift; + my( $self, @args ) = @_; - if( ( $_[ 0 ] || 1 ) == 1 && ( $_[ 1 ] || 1 ) == 1 ) { + if( ( $args[ 0 ] || 1 ) == 1 && ( $args[ 1 ] || 1 ) == 1 ) { $self->next_frame; } - $self->SUPER::set_position( @_ ); + $self->SUPER::set_position( @args ); } sub next_frame { my $self = shift; my $animation = $self->image; - return unless $animation->frames->[ -1 ]->height > 0; + return unless $animation->frames->[ -1 ]->height; $animation->add_frame( Image::TextMode::Canvas->new ); } @@ -38,6 +38,12 @@ __PACKAGE__->meta->make_immutable; Image::TextMode::Reader::ANSIMation - Reads ANSI Animation files +=head1 DESCRIPTION + +Provides reading capabilities for the ANSIMation format. This module +extends the ANSI reader, and simply creates a new frame for every +C<set_position(0,0)> command executed. + =head1 METHODS =head2 set_position( [$x, $y] ) lib/Image/TextMode/Reader/ANSIMation.pm @@ -39,6 +39,10 @@ __PACKAGE__->meta->make_immutable; Image::TextMode::Reader::Bin - Reads Bin files +=head1 DESCRIPTION + +Provides reading capabilities for the Bin format. + =head1 AUTHOR Brian Cassidy E<lt>bricas@cpan.orgE<gt> lib/Image/TextMode/Reader/Bin.pm @@ -103,6 +103,10 @@ __PACKAGE__->meta->make_immutable; Image::TextMode::Reader::IDF - Reads IDF files +=head1 DESCRIPTION + +Provides reading capabilities for the IDF format. + =head1 AUTHOR Brian Cassidy E<lt>bricas@cpan.orgE<gt> lib/Image/TextMode/Reader/IDF.pm @@ -99,6 +99,10 @@ __PACKAGE__->meta->make_immutable; Image::TextMode::Reader::Tundra - Reads Tundra files +=head1 DESCRIPTION + +Provides reading capabilities for the Tundra format. + =head1 AUTHOR Brian Cassidy E<lt>bricas@cpan.orgE<gt> lib/Image/TextMode/Reader/Tundra.pm @@ -1,6 +1,7 @@ package Image::TextMode::Reader::XBin; use Moose; +use Carp 'croak'; extends 'Image::TextMode::Reader'; @@ -32,8 +33,8 @@ sub _read { my $headerlength = read( $fh, $headerdata, 11 ); # does it start with the right data? - die 'Not an XBin file.' - unless $headerlength == 11 and $headerdata =~ /^XBIN$eof_char/; + croak 'Not an XBin file.' + unless $headerlength == 11 and $headerdata =~ m{^XBIN$eof_char}s; # parse header data _read_header( $image, $headerdata ); @@ -195,6 +196,10 @@ __PACKAGE__->meta->make_immutable; Image::TextMode::Reader::XBin - Reads XBin files +=head1 DESCRIPTION + +Provides reading capabilities for the XBin format. + =head1 AUTHOR Brian Cassidy E<lt>bricas@cpan.orgE<gt> lib/Image/TextMode/Reader/XBin.pm @@ -3,6 +3,7 @@ package Image::TextMode::Renderer::GD; use Moose; use GD; use Image::TextMode::Palette::ANSI; +use Carp 'croak'; =head1 NAME @@ -42,7 +43,7 @@ sub thumbnail { } my $image_l = do { - local $options->{ format } = 'object'; + local $options->{ format } = 'object'; ## no critic (Variables::ProhibitLocalVar) $self->fullscale( $source, $options ); }; @@ -231,7 +232,7 @@ sub _font_to_gd { for my $charval ( 0 .. $font_size ) { my $char = $chars->[ $charval ]; for ( @$char ) { - my @binary = split( //, sprintf( '%08b', $_ ) ); + my @binary = split( //s, sprintf( '%08b', $_ ) ); if ( $ninth ) { push @binary, @@ -242,7 +243,7 @@ sub _font_to_gd { print $temp pack( 'C*', @binary ); } } - close $temp; + close $temp or croak "Unable to close temp file: $!"; return GD::Font->load( $temp->filename ); } lib/Image/TextMode/Renderer/GD.pm @@ -12,6 +12,11 @@ my $COMNT_ID = 'COMNT'; Image::TextMode::SAUCE - Create, manipulate and save SAUCE metadata +=head1 DESCRIPTION + +This module reads and writes SAUCE metadata. SAUCE metadata is a 128-byte +record stored after an EOF char at the end of a given file. + =head1 ACCESSORS =over 4 @@ -184,7 +189,7 @@ Read the sauce record from C<$fh>. =cut -sub read { +sub read { ## no critic (Subroutines::ProhibitBuiltinHomonyms) my ( $self, $fh ) = @_; my $buffer; @@ -219,7 +224,7 @@ sub read { if ( substr( $buffer, 0, 5 ) eq $COMNT_ID ) { my $template = $comnt_template - . ( split( / /, $comnt_template ) )[ 1 ] + . ( split( / /s, $comnt_template ) )[ 1 ] x ( $comment_count - 1 ); my ( $id, @comments ) = unpack( $template, $buffer ); $self->comment_id( $id ); @@ -234,7 +239,7 @@ Write the sauce record to C<$fh>. =cut -sub write { +sub write { ## no critic (Subroutines::ProhibitBuiltinHomonyms) my ( $self, $fh ) = @_; seek( $fh, 0, 2 ); @@ -246,7 +251,7 @@ sub write { print $fh pack( $comnt_template . ( - ( split( / /, $comnt_template ) )[ 1 ] x ( $comments - 1 ) + ( split( / /s, $comnt_template ) )[ 1 ] x ( $comments - 1 ) ), $self->comment_id, @{ $self->comments } @@ -254,7 +259,7 @@ sub write { } # SAUCE... - my @template = split( / /, $sauce_template ); + my @template = split( / /s, $sauce_template ); for ( 0 .. $#sauce_fields ) { my $field = $sauce_fields[ $_ ]; my $value = ( $field ne 'comments' ) ? $self->$field : $comments; lib/Image/TextMode/SAUCE.pm @@ -1,11 +1,16 @@ package Image::TextMode::Writer; use Moose; +use Carp 'croak'; =head1 NAME Image::TextMode::Writer - A base class for file writers +=head1 DESCRIPTION + +This module provides some of the basic functionality for all writer classes. + =head1 METHODS =head2 new( %args ) @@ -19,7 +24,7 @@ method. =cut -sub write { +sub write { ## no critic (Subroutines::ProhibitBuiltinHomonyms) my ( $self, $image, $fh, $options ) = @_; $options ||= {}; $fh = _get_fh( $fh ); @@ -35,7 +40,7 @@ sub _get_fh { my $fh = $file; if ( !ref $fh ) { undef $fh; - open $fh, '>', $file; + open $fh, '>', $file or croak "Unable to open '$file': $!"; ## no critic (InputOutput::RequireBriefOpen) } binmode( $fh ); lib/Image/TextMode/Writer.pm @@ -5,9 +5,10 @@ use Moose; extends 'Image::TextMode::Writer'; # generates a 64 color palette +## no critic (BuiltinFunctions::ProhibitComplexMappings) my $default_pal = [ map { - my @d = split( //, sprintf( '%06b', $_ ) ); + my @d = split( //s, sprintf( '%06b', $_ ) ); { [ oct( "0b$d[ 3 ]$d[ 0 ]" ) * 63, oct( "0b$d[ 4 ]$d[ 1 ]" ) * 63, @@ -16,6 +17,7 @@ my $default_pal = [ } } 0 .. 63 ]; +## use critic sub _write { my ( $self, $image, $fh, $options ) = @_; @@ -27,7 +29,7 @@ sub _write { for my $row ( @{ $image->pixeldata } ) { print $fh - join( '', map { pack( 'aC', @{ $_ }{ 'char', 'attr' } ) } @$row ); + join( '', map { pack( 'aC', @{ $_ }{ qw( char attr ) } ) } @$row ); } } @@ -59,6 +61,10 @@ __PACKAGE__->meta->make_immutable; Image::TextMode::Writer::ADF - Writes ADF files +=head1 DESCRIPTION + +Provides writing capabilities for the ADF format. + =head1 AUTHOR Brian Cassidy E<lt>bricas@cpan.orgE<gt> lib/Image/TextMode/Writer/ADF.pm @@ -1,6 +1,7 @@ package Image::TextMode::Writer::ANSI; use Moose; +use charnames ':full'; extends 'Image::TextMode::Writer'; @@ -9,7 +10,7 @@ sub _write { my( $width, $height ) = $image->dimensions; # clear screen - print $fh "\x1b[2J"; + print $fh "\N{ESCAPE}[2J"; my $prevattr = ''; for my $y ( 0..$height - 1 ) { @@ -24,7 +25,7 @@ sub _write { my $pixel = $image->getpixel( $x, $y ) || { char => ' ', attr => 7 }; my $attr = _gen_args( $pixel->{ attr } ); if( $attr ne $prevattr ) { - print $fh "\x1b[0;", _gen_args( $pixel->{ attr } ), 'm'; + print $fh "\N{ESCAPE}[0;", _gen_args( $pixel->{ attr } ), 'm'; $prevattr = $attr; } print $fh $pixel->{ char }; @@ -33,7 +34,7 @@ sub _write { } # clear attrs - print $fh "\x1b[0m"; + print $fh "\N{ESCAPE}[0m"; } sub _gen_args { @@ -42,7 +43,7 @@ sub _gen_args { my $bg = 40 + ( ( $attr & 112 ) >> 4 ); my $bl = ( $attr & 128 ) ? 5 : ''; my $in = ( $attr & 8 ) ? 1 : ''; - return join ( ';', grep { length } ( $bl, $in, $fg, $bg ) ); + return join ( q{;}, grep { length } ( $bl, $in, $fg, $bg ) ); } no Moose; @@ -53,6 +54,10 @@ __PACKAGE__->meta->make_immutable; Image::TextMode::Writer::ANSI - Writes ANSI files +=head1 DESCRIPTION + +Provides writing capabilities for the ANSI format. + =head1 AUTHOR Brian Cassidy E<lt>bricas@cpan.orgE<gt> lib/Image/TextMode/Writer/ANSI.pm @@ -1,6 +1,7 @@ package Image::TextMode::Writer::ANSIMation; use Moose; +use charnames ':full'; extends 'Image::TextMode::Writer'; @@ -8,7 +9,7 @@ sub _write { my ( $self, $anim, $fh, $options ) = @_; # clear screen - print $fh "\x1b[2J"; + print $fh "\N{ESCAPE}[2J"; my $prevattr = ''; for my $image ( @{ $anim->frames } ) { @@ -26,7 +27,7 @@ sub _write { my $pixel = $image->getpixel( $x, $y ) || { char => ' ', attr => 7 }; my $attr = _gen_args( $pixel->{ attr } ); if( $attr ne $prevattr ) { - print $fh "\x1b[0;", _gen_args( $pixel->{ attr } ), 'm'; + print $fh "\N{ESCAPE}[0;", _gen_args( $pixel->{ attr } ), 'm'; $prevattr = $attr; } print $fh $pixel->{ char }; @@ -36,12 +37,12 @@ sub _write { # set position if( $image ne $anim->frames->[ -1 ] ) { - print $fh "\x1b[H"; + print $fh "\N{ESCAPE}[H"; } } # clear attrs - print $fh "\x1b[0m"; + print $fh "\N{ESCAPE}[0m"; } sub _gen_args { @@ -50,7 +51,7 @@ sub _gen_args { my $bg = 40 + ( ( $attr & 112 ) >> 4 ); my $bl = ( $attr & 128 ) ? 5 : ''; my $in = ( $attr & 8 ) ? 1 : ''; - return join ( ';', grep { length } ( $bl, $in, $fg, $bg ) ); + return join ( q{;}, grep { length } ( $bl, $in, $fg, $bg ) ); } no Moose; @@ -61,6 +62,10 @@ __PACKAGE__->meta->make_immutable; Image::TextMode::Writer::ANSIMation - Writes ANSIMation files +=head1 DESCRIPTION + +Provides writing capabilities for the ANSIMation format. + =head1 AUTHOR Brian Cassidy E<lt>bricas@cpan.orgE<gt> lib/Image/TextMode/Writer/ANSIMation.pm @@ -9,7 +9,7 @@ sub _write { for my $row ( @{ $image->pixeldata } ) { print $fh - join( '', map { pack( 'aC', @{ $_ }{ 'char', 'attr' } ) } @$row ); + join( '', map { pack( 'aC', @{ $_ }{ qw( char attr ) } ) } @$row ); } } @@ -21,6 +21,10 @@ __PACKAGE__->meta->make_immutable; Image::TextMode::Writer::Bin - Writes Bin files +=head1 DESCRIPTION + +Provides writing capabilities for the Bin format. + =head1 AUTHOR Brian Cassidy E<lt>bricas@cpan.orgE<gt> lib/Image/TextMode/Writer/Bin.pm @@ -1,6 +1,7 @@ package Image::TextMode::Writer::IDF; use Moose; +use charnames ':full'; extends 'Image::TextMode::Writer'; @@ -11,7 +12,7 @@ sub _write { my( $max_x, $max_y ) = map { $_ - 1 } $image->dimensions; - print $fh pack( $header_template, "\x041.4", 0, 0, $max_x, $max_y); + print $fh pack( $header_template, "\N{END OF TRANSMISSION}1.4", 0, 0, $max_x, $max_y); # Don't bother with RLE compression for now for my $y ( 0..$max_y ) { @@ -38,6 +39,11 @@ __PACKAGE__->meta->make_immutable; Image::TextMode::Writer::IDF - Writes IDF files +=head1 DESCRIPTION + +Provides writing capabilities for the IDF format. It currently does not +support any RLE compression. + =head1 AUTHOR Brian Cassidy E<lt>bricas@cpan.orgE<gt> lib/Image/TextMode/Writer/IDF.pm @@ -40,6 +40,11 @@ __PACKAGE__->meta->make_immutable; Image::TextMode::Writer::Tundra - Writes Tundra files +=head1 DESCRIPTION + +Provides writing capabilities for the Tundra format. It currently does not +support any RLE compression. + =head1 AUTHOR Brian Cassidy E<lt>bricas@cpan.orgE<gt> lib/Image/TextMode/Writer/Tundra.pm @@ -40,6 +40,11 @@ __PACKAGE__->meta->make_immutable; Image::TextMode::Writer::XBin - Writes XBin files +=head1 DESCRIPTION + +Provides writing capabilities for the XBin format. It currently only +supports uncompressed XBin files. + =head1 AUTHOR Brian Cassidy E<lt>bricas@cpan.orgE<gt> lib/Image/TextMode/Writer/XBin.pm @@ -7,6 +7,7 @@ use Image::TextMode::Loader; use Image::TextMode::Renderer::GD; use Getopt::Long (); use Pod::Usage (); +use Carp 'croak'; my %options; my $result = Getopt::Long::GetOptions( @@ -25,29 +26,43 @@ if ( !@files || $options{ help } ) { my $read_options = $options{ readopts }; my $render_options = $options{ renderopt }; my $method = $options{ thumbnail } ? 'thumbnail' : 'fullscale'; -my $force_filename = ( @files > 1 or !$options{ output } ) ? 1 : 0; +my $force_filename = ( @files > 1 || !$options{ output } ) ? 1 : 0; my $renderer = Image::TextMode::Renderer::GD->new; my ( $font, $pal ) = @options{ qw( font pal ) }; if ( $font ) { my $class = "Image::TextMode::Font::${font}"; - eval "use $class;"; + my $return = eval "use $class;"; + + if( !$return && $@ ) { + croak "Unable to load font '$font'"; + } + $font = $class->new; } if ( $pal ) { my $class = "Image::TextMode::Palette::${pal}"; - eval "use $class;"; + my $return = eval "use $class;"; + + if( !$return && $@ ) { + croak "Unable to load palette '$pal'"; + } + $pal = $class->new; } for my $file ( @files ) { - die 'file not found' if !-e $file; - die 'file not readable' if !-r $file; + croak "file not found: '$file'" if !-e $file; + croak "file not readable: '$file'" if !-r $file; my $image; if ( my $format = $options{ inputformat } ) { my $package = "Image\::TextMode\::Format\::${format}"; - eval "use $package;"; + my $return = eval "use $package;"; + + if( !$return && $@ ) { + croak "Unable to load format '$format'"; + } $image = $package->new; $image->read( $file, $read_options ); @@ -60,12 +75,12 @@ for my $file ( @files ) { if ( $force_filename ) { $output = $file - . ( $options{ thumbnail } ? '.t' : '' ) . '.' + . ( $options{ thumbnail } ? q{.t} : '' ) . q{.} . ( $options{ outputformat } || 'png' ); } - $output =~ s{[^.]+?$}{gif} - if $output ne '-' + $output =~ s{[^.]+?$}{gif}s + if $output ne q{-} && $image->isa( 'Image::TextMode::Format::ANSIMation' ); $image->font( $font ) if $font; @@ -73,13 +88,13 @@ for my $file ( @files ) { my $data = $renderer->$method( $image, $render_options ); - if ( $output eq '-' ) { + if ( $output eq q{-} ) { print $data; } else { - open( my $fh, '>', $output ) or die "cannot write file ($output): $!"; + open( my $fh, '>', $output ) or croak "Unable to open file '$output': $!"; print $fh $data; - close( $fh ); + close( $fh ) or croak "Unable to close file '$output': $!"; } } script/textmode2png def1fa3392fc944c0242952ab59324ac026058b6 Brian Cassidy bricas@cpan.org http://github.com/bricas/image-textmode/commit/0889b780fb657359c3494dbc85c200d8434b6e90 0889b780fb657359c3494dbc85c200d8434b6e90 2009-02-16T18:11:07-08:00 2009-02-16T18:11:07-08:00 conform to Perl::Critic policies. added xt/author test for it. 41b646a08984c4b9271aa9db5b035b899eeceb32 Brian Cassidy bricas@cpan.org