From ff7796e670986b60410df58126551916084dbbce Mon Sep 17 00:00:00 2001
From: shish <shish@7f39781d-f577-437e-ae19-be835c7a54ca>
Date: Sun, 1 Jul 2007 18:19:22 +0000
Subject: [PATCH] force thumbnails to be jpeg

git-svn-id: file:///home/shish/svn/shimmie2/branches/branch_2.0@208 7f39781d-f577-437e-ae19-be835c7a54ca
---
 core/ext/image.ext.php  | 2 +-
 ext/regen_thumb.ext.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/ext/image.ext.php b/core/ext/image.ext.php
index b80354fe..3cdb4ba4 100644
--- a/core/ext/image.ext.php
+++ b/core/ext/image.ext.php
@@ -94,7 +94,7 @@ class ImageIO extends Extension {
 		$h = $config->get_int("thumb_height");
 		$q = $config->get_int("thumb_quality");
 
-		exec("convert $inname -geometry {$w}x{$h} -quality {$q} $outname");
+		exec("convert {$inname}[0] -geometry {$w}x{$h} -quality {$q} jpg:$outname");
 
 		return true;
 	}
diff --git a/ext/regen_thumb.ext.php b/ext/regen_thumb.ext.php
index 8a5ebc7d..30ff940f 100644
--- a/ext/regen_thumb.ext.php
+++ b/ext/regen_thumb.ext.php
@@ -38,7 +38,7 @@ class RegenThumb extends Extension {
 		switch($program) {
 			case 'convert':
 				unlink($f_thumb);
-				exec("convert $f_image -geometry {$w}x{$h} -quality {$q} $f_thumb");
+				exec("convert {$f_image}[0] -geometry {$w}x{$h} -quality {$q} jpg:$f_thumb");
 				break;
 			case 'gd':
 				$this->make_thumb_gd($f_image, $f_thumb);