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

have a single var for memory limit

Browse Source
This commit is contained in:
Shish 2012-05-22 12:26:47 +01:00
parent 61f3a9d372
commit cb8b4f3329
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ext/et/main.php
View File

@ -54,7 +54,7 @@ class ET extends Extension {
$info['thumb_quality'] = $config->get_int('thumb_quality'); $info['thumb_quality'] = $config->get_int('thumb_quality');
$info['thumb_width'] = $config->get_int('thumb_width'); $info['thumb_width'] = $config->get_int('thumb_width');
$info['thumb_height'] = $config->get_int('thumb_height'); $info['thumb_height'] = $config->get_int('thumb_height');
$info['thumb_mem'] = $config->get_int("thumb_max_memory"); $info['thumb_mem'] = $config->get_int("thumb_mem_limit");
$info['stat_images'] = $database->get_one("SELECT COUNT(*) FROM images"); $info['stat_images'] = $database->get_one("SELECT COUNT(*) FROM images");
$info['stat_comments'] = $database->get_one("SELECT COUNT(*) FROM comments"); $info['stat_comments'] = $database->get_one("SELECT COUNT(*) FROM comments");

2
ext/handle_ico/main.php
View File

@ -97,7 +97,7 @@ class IcoFileHandler extends Extension {
$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");
$mem = $config->get_int("thumb_max_memory") / 1024 / 1024; // IM takes memory in MB $mem = $config->get_int("thumb_mem_limit") / 1024 / 1024; // IM takes memory in MB
if($config->get_bool("ico_convert")) { if($config->get_bool("ico_convert")) {
// "-limit memory $mem" broken? // "-limit memory $mem" broken?

1
ext/handle_pixel/main.php
View File

@ -90,7 +90,6 @@ 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");
$mem = $config->get_int("thumb_max_memory") / 1024 / 1024; // IM takes memory in MB
// Windows is a special case // Windows is a special case
if(in_array("OS", $_SERVER) && $_SERVER["OS"] == 'Windows_NT') { if(in_array("OS", $_SERVER) && $_SERVER["OS"] == 'Windows_NT') {

4
ext/image/main.php
View File

@ -267,7 +267,9 @@ class ImageIO extends Extension {
$sb->add_int_option("thumb_quality"); $sb->add_int_option("thumb_quality");
$sb->add_label(" % quality "); $sb->add_label(" % quality ");
$sb->add_shorthand_int_option("thumb_mem_limit", "<br>Max memory use: "); if($config->get_string("thumb_engine") == "gd") {
$sb->add_shorthand_int_option("thumb_mem_limit", "<br>Max memory use: ");
}
$event->panel->add_block($sb); $event->panel->add_block($sb);
} }