final tweaks of gd upload code

diff --git a/actions/upload.php b/actions/upload.php
index a297128c41bf078c24c9f9c68d0d02bb04fe26db..1b877607523e47d2f4bca52cb8529bede39018b6 100644 (file)
--- a/actions/upload.php
+++ b/actions/upload.php
@@ -116,8 +116,8 @@
                $mem_avail = rtrim($mem_avail, 'M');\r
                $mem_avail = $mem_avail * 1024 * 1024;\r
                if ($image_lib == 'GD') {\r
-                       $mem_required = 5 * $imginfo[0] * $imginfo[1];\r
-                       $mem_avail = $mem_avail - memory_get_peak_usage() - 4194304; // 4 MB buffer\r
+                       $mem_required = ceil(5.35 * $imginfo[0] * $imginfo[1]);\r
+                       $mem_avail = $mem_avail - memory_get_peak_usage() - 2097152; // 2 MB buffer\r
                        if ($mem_required > $mem_avail) {\r
                                array_push($not_uploaded, $sent_file['name']);\r
                                array_push($error_msgs, elgg_echo('tidypics:image_pixels'));\r

diff --git a/lib/resize.php b/lib/resize.php
index 9db81f318b8067b0dddb11a1586fb106e4b93b44..7c06b28c5f2de1e71e19fdfa648c88f6b83717c1 100644 (file)
--- a/lib/resize.php
+++ b/lib/resize.php
@@ -185,6 +185,9 @@
                                break;\r
                }\r
                \r
+               imagedestroy($newimage);\r
+               imagedestroy($oldimage);\r
+               \r
                return $rtn_code;\r
        }\r
 \r