james/fembooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #256 from velocity37/master

Browse Source 
Resolution for Issue #254 (path to `convert` binary accidentally hardcoded)
This commit is contained in:
Shish 2012-08-22 01:00:24 -07:00
commit 902d0adbd7
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ext/handle_pixel/main.php
View File

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

7
ext/image/main.php
View File

@ -135,7 +135,7 @@ class ImageIO extends Extension {
$config->set_default_int('thumb_height', 192); $config->set_default_int('thumb_height', 192);
$config->set_default_int('thumb_quality', 75); $config->set_default_int('thumb_quality', 75);
$config->set_default_int('thumb_mem_limit', parse_shorthand_int('8MB')); $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")) { if(function_exists("exif_read_data")) {
$config->set_default_bool('image_show_meta', false); $config->set_default_bool('image_show_meta', false);
@ -265,6 +265,11 @@ class ImageIO extends Extension {
$sb->add_int_option("thumb_quality"); $sb->add_int_option("thumb_quality");
$sb->add_label(" % quality "); $sb->add_label(" % quality ");
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") { if($config->get_string("thumb_engine") == "gd") {
$sb->add_shorthand_int_option("thumb_mem_limit", "<br>Max memory use: "); $sb->add_shorthand_int_option("thumb_mem_limit", "<br>Max memory use: ");
} }