Merge branch '3.4RC'3.4

3 files changed, 22 insertions, 3 deletions

diff --git a/include/photo/photo_driver.php b/include/photo/photo_driver.php
index 6af753195..2e2f5a758 100644
--- a/include/photo/photo_driver.php
+++ b/include/photo/photo_driver.php
@@ -75,6 +75,7 @@ abstract class photo_driver {
 
 	abstract function imageString();
 
+	abstract function clearexif();
 
 	public function __construct($data, $type='') {
 		$this->types = $this->supportedTypes();
@@ -273,7 +274,7 @@ abstract class photo_driver {
 		}
 
 		if($f) {
-			return @exif_read_data($f);
+			return @exif_read_data($f,null,true);
 		}
 
 		return false;
@@ -289,12 +290,12 @@ abstract class photo_driver {
 			return false;
 		}
 
-		$ort = $exif['IFD0']['Orientation'];
+		$ort = ((array_key_exists('IFD0',$exif)) ? $exif['IFD0']['Orientation'] : $exif['Orientation']);
 
 		if(! $ort) {
 			return false;
 		}
-
+		
 		switch($ort) {
 			case 1: // nothing
 				break;
diff --git a/include/photo/photo_gd.php b/include/photo/photo_gd.php
index 24bdc204f..e98ac2827 100644
--- a/include/photo/photo_gd.php
+++ b/include/photo/photo_gd.php
@@ -35,6 +35,11 @@ class photo_gd extends photo_driver {
 	}
 
 
+	public function clearexif() {
+		return;
+	}
+
+
 	public function destroy() {
 		if($this->is_valid()) {
 			imagedestroy($this->image);
diff --git a/include/photo/photo_imagick.php b/include/photo/photo_imagick.php
index 32bb61342..89577e71e 100644
--- a/include/photo/photo_imagick.php
+++ b/include/photo/photo_imagick.php
@@ -96,6 +96,19 @@ class photo_imagick extends photo_driver {
 	}
 
 
+	public function clearexif() {
+
+		$profiles = $this->image->getImageProfiles("icc", true);
+
+		$this->image->stripImage();
+
+		if(!empty($profiles)) {
+    		$this->image->profileImage("icc", $profiles['icc']);
+		}
+	}
+
+
+
 	public function getImage() {
 		if(!$this->is_valid())
 			return FALSE;