aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2015-03-16 20:08:05 -0700
committerfriendica <info@friendica.com>2015-03-16 20:08:05 -0700
commit7c194c37b891f122740de52d154db0af612e0074 (patch)
treef6711feacffd3141c4342eb4d613b0228c1a0ccc
parent841f94ce2adad86b65f8ff332e1d541ebeec8f69 (diff)
downloadvolse-hubzilla-7c194c37b891f122740de52d154db0af612e0074.tar.gz
volse-hubzilla-7c194c37b891f122740de52d154db0af612e0074.tar.bz2
volse-hubzilla-7c194c37b891f122740de52d154db0af612e0074.zip
started to add the ability to geotag photos (default will be disabled) but my phone isn't outputting the GPS tags even after being explicitly enabled so I'll have to wait until I've got a device that I can reliably test against.
-rw-r--r--include/photo/photo_driver.php11
-rw-r--r--include/photos.php4
2 files changed, 12 insertions, 3 deletions
diff --git a/include/photo/photo_driver.php b/include/photo/photo_driver.php
index e63125671..6f508bf72 100644
--- a/include/photo/photo_driver.php
+++ b/include/photo/photo_driver.php
@@ -241,9 +241,9 @@ abstract class photo_driver {
if((! function_exists('exif_read_data')) || ($this->getType() !== 'image/jpeg'))
return;
- $exif = @exif_read_data($filename);
+ $exif = @exif_read_data($filename,null,true);
if($exif) {
- $ort = $exif['Orientation'];
+ $ort = $exif['IFD0']['Orientation'];
switch($ort)
{
@@ -280,7 +280,14 @@ abstract class photo_driver {
$this->rotate(90);
break;
}
+
+ // logger('exif: ' . print_r($exif,true));
+ return $exif;
+
}
+
+ return false;
+
}
diff --git a/include/photos.php b/include/photos.php
index c2f5ed4ba..4b7809fc1 100644
--- a/include/photos.php
+++ b/include/photos.php
@@ -125,7 +125,9 @@ function photo_upload($channel, $observer, $args) {
return $ret;
}
- $ph->orient($src);
+ $exif = $ph->orient($src);
+
+
@unlink($src);
$max_length = get_config('system','max_image_length');