Prima::Image->save recognizes (format => 'png') syntax

Author: dk

Prima/Image/base64.pm

@@ -45,7 +45,7 @@ sub save
 
 	$param{codecID} //= $i->{extras}->{codecID};
 
-	unless ( $param{codecID}) {
+	unless ( $param{format} || $param{codecID}) {
 		my @want;
 		if ( $i->isa('Prima::Icon')) {
 			if ( (($i-> type & im::BPP) > 8) || ($i-> maskType > 1)) {

img/load.c

@@ -218,7 +218,7 @@ codec_matches_extension( PImgCodec c, char *fileName)
 	while ( c-> info-> fileExtensions[ j]) {
 		char * ext = c-> info-> fileExtensions[ j];
 		int extLen = strlen( ext);
-		if ( extLen < fileNameLen && stricmp( fileName + fileNameLen - extLen, ext) == 0)
+		if ( extLen <= fileNameLen && stricmp( fileName + fileNameLen - extLen, ext) == 0)
 			return true;
 		j++;
 	}
@@ -912,13 +912,24 @@ apc_img_open_save( char * fileName, Bool is_utf8, int n_frames, PImgIORequest io
 
 	/* checking 'codecID', if available */
 	{
-		SV * c = NULL;
+		SV * svc = NULL;
 		if ( pexist( codecID))
-			c = pget_sv( codecID);
-		if ( c && SvOK( c)) { /* accept undef */
-			codecID = SvIV( c);
+			svc = pget_sv( codecID);
+		if ( svc && SvOK( svc)) { /* accept undef */
+			codecID = SvIV( svc);
 			if ( codecID < 0)
 				codecID = imgCodecs. count - codecID;
+		} else if ( pexist(format)) {
+			int i;
+			char * format = pget_c(format);
+			for ( i = 0; i < imgCodecs. count; i++) {
+				if ( disabled[ i]) continue;
+				c = ( PImgCodec ) ( imgCodecs. items[ i]);
+				if ( !codec_matches_extension( c, format))
+					continue;
+				codecID = i;
+				break;
+			}
 		}
 	}
 

pod/Prima/Image.pod

@@ -930,19 +930,20 @@ success flag.  The method features different semantics, depending on
 the PARAMETERS hash. If an error occurs, the C<$@> variable contains the error
 string.
 
-Note that when saving to a stream, C<codecID> must be explicitly given in
-C<%PARAMETERS>.
+Note that when saving to a stream, either C<codecID> or C<format> must be
+explicitly given in C<%PARAMETERS>.
 
-See L<Prima::image-load> for details and L<Prima::Image::Loader/Prima::Image::Saver> for more functionality.
+See L<Prima::image-load> for details and
+L<Prima::Image::Loader/Prima::Image::Saver> for more functionality.
 
 Note: when saving to streams on win32, mind the C<binmode>.
 
 =item save_stream BASE64_STRING, %OPTIONS
 
-Saves the image into an internal stream.  Unless C<$OPTIONS{codecID}> or
-C<$image->{extras}->{codecID}> is set, tries to find the best codec for the
-job.  Returns the base64-encoded content on success, or C<undef> on failure;
-C<$@> is set in the latter case.
+Saves the image into an internal stream.  Unless C<$OPTIONS{format}> or
+C<$OPTIONS{codecID}> or C<$image->{extras}->{codecID}> is set, tries to find
+the best codec for the job.  Returns the base64-encoded content on success, or
+C<undef> on failure; C<$@> is set in the latter case.
 
 =item scanline Y
 

pod/Prima/image-load.pod

@@ -338,20 +338,24 @@ Save requests also can be performed with the package syntax:
 
 =head2 Saving to a stream
 
-Saving to a stream requires the explicit C<codecID> integer value to be
-supplied. When the image is loaded with C<loadExtras>, this field is always
+Saving to a stream requires the explicit file format to be specified.  This can
+be done by either supplying a C<codecID> integer that both identifies the file
+format and the codec that would preform the encoding operation, or a C<format>
+string, that should match file extension of the desired file format.
+
+When the image is loaded with C<loadExtras>, the C<codecID> field is always
 present on the image object and is the integer that selects the image file
 format.
 
-   my ($png_id) =
-      map  { $_-> {codecID} }
-      grep { $_-> {fileShortType} =~ /^png$/i }
-      @{ Prima::Image-> codecs };
-   die "No png codec installed" unless $png_id;
-
+   my $png = Prima::Image->has_codec('png') or die "No png codec installed";
    open FILE, ">", "a.png" or die "Cannot save:$!";
    binmode FILE;
-   $image-> save( \*FILE, codecID => $png_id)
+   $image-> save( \*FILE, codecID => $png->{codecID})
+      or die "Cannot save:$@";
+
+or alternatively,
+
+   $image-> save( \*FILE, format => 'png')
       or die "Cannot save:$@";
 
 =head2 Multiframe saving