From d154b386801b4eb733fd01f2bfc8e601c8705c36 Mon Sep 17 00:00:00 2001
From: velocity37 <velocity37@gmail.com>
Date: Tue, 21 Aug 2012 18:42:14 -0700
Subject: [PATCH 1/4] Add thumb_convert_path to Board Config

---
 ext/image/main.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ext/image/main.php b/ext/image/main.php
index f1e9aac6..12c52510 100644
--- a/ext/image/main.php
+++ b/ext/image/main.php
@@ -264,6 +264,8 @@ class ImageIO extends Extension {
 		$sb->add_label(" px at ");
 		$sb->add_int_option("thumb_quality");
 		$sb->add_label(" % quality ");
+		$sb->add_label("<br>ImageMagick Binary: ");
+		$sb->add_text_option("thumb_convert_path");
 
 		if($config->get_string("thumb_engine") == "gd") {
 			$sb->add_shorthand_int_option("thumb_mem_limit", "<br>Max memory use: ");

From 10fadb27d148c4a2c4af5790d53733ec1c239bcb Mon Sep 17 00:00:00 2001
From: velocity37 <velocity37@gmail.com>
Date: Tue, 21 Aug 2012 18:46:34 -0700
Subject: [PATCH 2/4] Make thumb_convert_path not Windows-specific

---
 ext/image/main.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ext/image/main.php b/ext/image/main.php
index 12c52510..73aef6c4 100644
--- a/ext/image/main.php
+++ b/ext/image/main.php
@@ -135,7 +135,7 @@ class ImageIO extends Extension {
 		$config->set_default_int('thumb_height', 192);
 		$config->set_default_int('thumb_quality', 75);
 		$config->set_default_int('thumb_mem_limit', parse_shorthand_int('8MB'));
-		$config->set_default_string('thumb_convert_path', 'convert.exe');
+		$config->set_default_string('thumb_convert_path', 'convert');
 
 		if(function_exists("exif_read_data")) {
 			$config->set_default_bool('image_show_meta', false);

From a2e1edded5350de13bf1083bde4e26698a29fd5b Mon Sep 17 00:00:00 2001
From: velocity37 <velocity37@gmail.com>
Date: Tue, 21 Aug 2012 18:51:20 -0700
Subject: [PATCH 3/4] Actually use thumb_convert_path

The check would always fail even on Windows, resulting in thumb_convert_path never being used. See:
https://github.com/shish/shimmie2/issues/254
---
 ext/handle_pixel/main.php | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/ext/handle_pixel/main.php b/ext/handle_pixel/main.php
index 9546699a..cb330076 100644
--- a/ext/handle_pixel/main.php
+++ b/ext/handle_pixel/main.php
@@ -90,14 +90,7 @@ class PixelFileHandler extends DataHandlerExtension {
 		$w = $config->get_int("thumb_width");
 		$h = $config->get_int("thumb_height");
 		$q = $config->get_int("thumb_quality");
-
-		// Windows is a special case
-		if(in_array("OS", $_SERVER) && $_SERVER["OS"] == 'Windows_NT') {
-			$convert = $config->get_string("thumb_convert_path");
-		}
-		else {
-			$convert = "convert";
-		}
+		$convert = $config->get_string("thumb_convert_path");
 
 		//  ffff imagemagic fails sometimes, not sure why
 		//$format = "'%s' '%s[0]' -format '%%[fx:w] %%[fx:h]' info:";

From 624468851ec85562724be23d717631f8e0d77dcc Mon Sep 17 00:00:00 2001
From: velocity37 <velocity37@gmail.com>
Date: Tue, 21 Aug 2012 19:00:25 -0700
Subject: [PATCH 4/4] Only show thumb_convert_path if using ImageMagick

---
 ext/image/main.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/ext/image/main.php b/ext/image/main.php
index 73aef6c4..f4650626 100644
--- a/ext/image/main.php
+++ b/ext/image/main.php
@@ -264,8 +264,11 @@ class ImageIO extends Extension {
 		$sb->add_label(" px at ");
 		$sb->add_int_option("thumb_quality");
 		$sb->add_label(" % quality ");
-		$sb->add_label("<br>ImageMagick Binary: ");
-		$sb->add_text_option("thumb_convert_path");
+		
+		if($config->get_string("thumb_engine") == "convert") {
+			$sb->add_label("<br>ImageMagick Binary: ");
+			$sb->add_text_option("thumb_convert_path");
+		}
 
 		if($config->get_string("thumb_engine") == "gd") {
 			$sb->add_shorthand_int_option("thumb_mem_limit", "<br>Max memory use: ");