Merge remote branch 'upstream/master'

1 files changed, 24 insertions, 8 deletions

diff --git a/include/photo/photo_driver.php b/include/photo/photo_driver.php
index d9777b1c4..42997060b 100644
--- a/include/photo/photo_driver.php
+++ b/include/photo/photo_driver.php
@@ -3,11 +3,24 @@
 function photo_factory($data, $type = null) {
 	$ph = null;
 
-	if(class_exists('Imagick')) {
-		require_once('include/photo/photo_imagick.php');
-		$ph = new photo_imagick($data,$type);
+	$ignore_imagick = get_config('system', 'ignore_imagick');
+
+	if(class_exists('Imagick') && !$ignore_imagick) {
+		$v = Imagick::getVersion();
+		preg_match('/ImageMagick ([0-9]+\.[0-9]+\.[0-9]+)/', $v['versionString'], $m);
+		if(version_compare($m[1],'6.6.7') >= 0) {
+			require_once('include/photo/photo_imagick.php');
+			$ph = new photo_imagick($data,$type);
+		}
+		else {
+			// earlier imagick versions have issues with scaling png's
+			// don't log this because it will just fill the logfile.
+			// leave this note here so those who are looking for why 
+			// we aren't using imagick can find it
+		}
 	}
-	else {
+
+	if(! $ph) {
 		require_once('include/photo/photo_gd.php');
 		$ph = new photo_gd($data,$type);
 	}
@@ -480,11 +493,11 @@ abstract class photo_driver {
  * Guess image mimetype from filename or from Content-Type header
  *
  * @arg $filename string Image filename
- * @arg $fromcurl boolean Check Content-Type header from curl request
+ * @arg $headers string Headers to check for Content-Type (from curl request)
  */
 
 function guess_image_type($filename, $headers = '') {
-	logger('Photo: guess_image_type: '.$filename . ($fromcurl?' from curl headers':''), LOGGER_DEBUG);
+	logger('Photo: guess_image_type: '.$filename . ($headers?' from curl headers':''), LOGGER_DEBUG);
 	$type = null;
 	if ($headers) {
 		$a = get_app();
@@ -494,13 +507,16 @@ function guess_image_type($filename, $headers = '') {
 			list($k,$v) = array_map("trim", explode(":", trim($l), 2));
 			$hdrs[$k] = $v;
 		}
+		logger('Curl headers: '.var_export($hdrs, true), LOGGER_DEBUG);
 		if (array_key_exists('Content-Type', $hdrs))
 			$type = $hdrs['Content-Type'];
 	}
 	if (is_null($type)){
 // FIXME!!!!
+		$ignore_imagick = get_config('system', 'ignore_imagick');
 		// Guessing from extension? Isn't that... dangerous?
-		if(class_exists('Imagick') && file_exists($filename) && is_readable($filename)) {
+		if(class_exists('Imagick') && !$ignore_imagick) {
+			logger('using imagemagick', LOGGER_DEBUG);
 			/**
 			 * Well, this not much better,
 			 * but at least it comes from the data inside the image,
@@ -552,7 +568,7 @@ function import_profile_photo($photo,$xchan,$thing = false) {
 
 	if($photo) {
 		$filename = basename($photo);
-		$type = guess_image_type($photo,true);
+		$type = guess_image_type($photo);
 
 		if(! $type)
 			$type = 'image/jpeg';