new cvs checkin

cthumb ChangeLog VERSION cthumb.in

Update of /cvsroot/cthumb/cthumb
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9052

Modified Files:
	ChangeLog VERSION cthumb.in 
Log Message:

check in (most of) andreas submission.

Index: ChangeLog
===================================================================
RCS file: /cvsroot/cthumb/cthumb/ChangeLog,v
retrieving revision 1.31
diff -u -r1.31 ChangeLog
--- ChangeLog	7 Nov 2003 22:05:07 -0000	1.31
+++ ChangeLog	4 Apr 2004 20:20:01 -0000
@@ -1,3 +1,18 @@
+Sun Apr  4 13:32:06 PDT 2004 "Andreas V. Meier" <avmeier _at_ web dot de>
+
+	* cthumb.in: support for PNG files.
+	* contrib/cthumbAlbumCreator-0.1.pl:
+	  cthumbAlbumCreator is a script, that recursively dives into subdirs
+	  and creates a metafile (ending .cac) for all pages and images with
+	  comments. This file can be edited, images aligned into pages,
+	  comments may be added.
+
+	  From this metafile an albumfile is created. This prevents recreation
+	  of the file index to overwrite old comments, alignments et al.
+	  cthumbAlbumCreator by default creates an extra page for each subdir.
+	  It can be supplied with a list of actions, to specify the order or
+	  omit e.g. writing the metafile and so on.
+
 Thu Nov  6 21:29:21 CET 2003  Claudio Piciarelli <piccia _at_ libero.it>
 
 	* cthumb.in: 
Index: VERSION
===================================================================
RCS file: /cvsroot/cthumb/cthumb/VERSION,v
retrieving revision 1.15
diff -u -r1.15 VERSION
--- VERSION	27 May 2003 18:24:40 -0000	1.15
+++ VERSION	4 Apr 2004 20:20:01 -0000
@@ -1 +1 @@
-4.3.1
+4.3.2
Index: cthumb.in
===================================================================
RCS file: /cvsroot/cthumb/cthumb/cthumb.in,v
retrieving revision 1.23
diff -u -r1.23 cthumb.in
--- cthumb.in	7 Nov 2003 22:05:07 -0000	1.23
+++ cthumb.in	4 Apr 2004 20:20:03 -0000
@@ -721,7 +721,7 @@
     my $pic = shift;
 
     #   CthumbDir is the directory where thumbnails go (thumb or '.')
-    $pic =~ m#^(.*/)?([^/]+)\.(gif|tif+|jpe?g)$#i;
+    $pic =~ m#^(.*/)?([^/]+)\.(gif|tif+|jpe?g|png)$#i;
 
     my $base = (defined($1)) ? $1 : '';
     if ($CthumbDir) { return $base . "$CthumbDir/$2-thumb.jpg"; }
@@ -753,6 +753,8 @@
   }
   for my $cmd ("djpeg", "pngtopnm", "giftopnm", "tifftopnm") {
     my $pnm = `$cmd "$name" `;
+    if ($pnm eq "") { print "not with $cmd ... "; }
+    else            { print "with $cmd ..."; } ;
     return $pnm unless $?;
   }
   return;
@@ -1748,7 +1750,7 @@
 
 	my $pnm = "";
 	if (!($pnm = &get_pnm($src))) {
-            die "Cannot scale image `$dest`.";
+            warn "Cannot scale image `$dest`, cthumb will fail!";
 	}
 	# make pnmscale shut up (version in redhat 7.2
 	# spits out stuff to stderr, even without -verbose, arggh)
@@ -1763,7 +1765,7 @@
 	    close PNMTOTHUMB;
 	    print "done.\n";
 	} else {
-            die "Cannot scale image `$dest`.";
+            warn "Cannot scale image `$dest`.";
 	}
     }
 
@@ -1799,6 +1801,17 @@
 	}
     }
 
+    if ($picname =~ /\.png$/i) {
+	open FILE, "pngtopnm \"$picname\" | pnmfile |" or
+	    return "";
+	$_ = <FILE>;
+	if (/^stdin:\s+PPM raw, (\d+) by (\d+)/) {
+	    $width = $1; $height = $2;
+	    close FILE;
+	    return "$width" . "x" . "$height";
+	}
+    }
+
     return "";
 }
 



-------------------------------------------------------
This SF.Net email is sponsored by: IBM Linux Tutorials
Free Linux tutorial presented by Daniel Robbins, President and CEO of
GenToo technologies. Learn everything from fundamentals to system
administration.http://ads.osdn.com/?ad_id=1470&alloc_id=3638&op=click