Merge https://github.com/savetheinternet/Tinyboard-Tools into vichan-devel-4.5

Conflicts:
	README.md
	js/auto-reload.js
	js/fix-report-delete-submit.js
	js/forced-anon.js
	js/local-time.js
	js/post-hover.js
	js/quick-post-controls.js
	js/quick-reply.js
	js/show-backlinks.js
	js/smartphone-spoiler.js
	migration/kusabax.php
	stylesheets/dark.css
	stylesheets/futaba+vichan.css
	stylesheets/miku.css
	stylesheets/testorange.css
	stylesheets/wasabi.css
	tools/benchmark.php
	tools/i18n_extract.php
	tools/inc/cli.php
	tools/rebuild.php

1 files changed, 7 insertions, 2 deletions

diff --git a/tools/benchmark.php b/tools/benchmark.php
index 8c97364c..ed7c200d 100644..100755
--- a/tools/benchmark.php
+++ b/tools/benchmark.php
@@ -47,6 +47,11 @@ function benchmark($method) {
 }
 
 benchmark('gd');
-benchmark('imagick');
+if (extension_loaded('imagick')) {
+	benchmark('imagick');
+} else {
+	echo "Imagick extension not loaded... skipping.\n";
+}
 benchmark('convert');
-
+benchmark('gm');
+becnhmark('convert+gifsicle');