From: Michael Prokop <mika@grml.org>
Date: Wed, 5 May 2010 13:56:39 +0000 (+0200)
Subject: Update iimage version to 38.
X-Git-Tag: v1.3.2~3
X-Git-Url: http://git.grml.org/?p=grml-scripts.git;a=commitdiff_plain;h=978594a13eb12d6b1718dc165696dc64a6e8bc25

Update iimage version to 38.

iimage v38 uses convert with -resize instead of -geometry, addressing an annnoying resizing issue.
---

diff --git a/usr_bin/iimage b/usr_bin/iimage
index 77a74ab..e71edeb 100755
--- a/usr_bin/iimage
+++ b/usr_bin/iimage
@@ -49,7 +49,7 @@
 #
 ######################################################################
 
-SVN_ID="$Id: iimage 37 2006-08-22 13:50:17Z ronsc $"
+SVN_ID="$Id: iimage 38 2009-12-15 20:30:46Z ronsc $"
 
 # old templates might still use CVS_VERSION
 CVS_VERSION="$SVN_ID"
@@ -112,7 +112,7 @@ function AVI_handler_prepare() {
          mplayer -quiet -frames 1 -ao none -vo jpeg -jpeg outdir=$DATADIR $1 >/dev/null 2>/dev/null
 
          if  [ -f "$DATADIR/00000001.jpg" ] ; then
-            convert "$DATADIR/00000001.jpg" -geometry $THUMBNAIL_GEOMETRY "$DST"
+            convert "$DATADIR/00000001.jpg" -resize $THUMBNAIL_GEOMETRY "$DST"
          fi
 
          rm -f $DATADIR 00000001.jpg 00000002.jpg
@@ -533,7 +533,7 @@ function build_thumbnail() {
 
          echo -n " T"
          convert  -quality $THUMBNAIL_QUALITY \
-                  -geometry "$GEOMETRY+0+0>" "$LASTIMAGE" \
+                  -resize "$GEOMETRY+0+0>" "$LASTIMAGE" \
                   "$DST"
 #                  +profile "$LASTIMAGE" \