From 0ea5ced2b723ed55c3b9ef7e1071fe6d75c77f75 Mon Sep 17 00:00:00 2001
From: Gerrit Uitslag <klapinklapin@gmail.com>
Date: Tue, 15 Oct 2013 16:45:19 +0200
Subject: output of fread is string, but recognized as object. Fixed assign by
 ref

---
 inc/JpegMeta.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'inc/JpegMeta.php')

diff --git a/inc/JpegMeta.php b/inc/JpegMeta.php
index ba6a2b5bb..947407a48 100644
--- a/inc/JpegMeta.php
+++ b/inc/JpegMeta.php
@@ -975,7 +975,7 @@ class JpegMeta {
 
             if ($capture) {
                 if ($length)
-                    $this->_markers[$count]['data'] =& fread($this->_fp, $length);
+                    $this->_markers[$count]['data'] = fread($this->_fp, $length);
                 else
                     $this->_markers[$count]['data'] = "";
             }
-- 
cgit v1.2.3


From 5aaca723334349b7efc215172c472976e99c130d Mon Sep 17 00:00:00 2001
From: Gerrit Uitslag <klapinklapin@gmail.com>
Date: Wed, 16 Oct 2013 11:50:33 +0200
Subject: fixed some errors indicated by IDEA

---
 inc/JpegMeta.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'inc/JpegMeta.php')

diff --git a/inc/JpegMeta.php b/inc/JpegMeta.php
index ba6a2b5bb..87c95103a 100644
--- a/inc/JpegMeta.php
+++ b/inc/JpegMeta.php
@@ -161,7 +161,7 @@ class JpegMeta {
             if($info != false) break;
         }
 
-        if($info === false)  $info = $alt;
+        if($info === false)  $info = '';
         if(is_array($info)){
             if(isset($info['val'])){
                 $info = $info['val'];
@@ -874,7 +874,7 @@ class JpegMeta {
     /*************************************************************/
 
     /*************************************************************/
-    function _dispose() {
+    function _dispose($fileName = "") {
         $this->_fileName = $fileName;
 
         $this->_fp = null;
@@ -2183,7 +2183,8 @@ class JpegMeta {
                         }
 
                         while ($j < $count) {
-                            $this->_putString($value, $j * 4, "\0\0\0\0");
+                            $v = "\0\0\0\0";
+                            $this->_putString($value, $j * 4, $v);
                             $j++;
                         }
                         break;
@@ -2206,7 +2207,8 @@ class JpegMeta {
                         }
 
                         while ($j < $count) {
-                            $this->_putString($value, $j * 8, "\0\0\0\0\0\0\0\0");
+                            $v = "\0\0\0\0\0\0\0\0";
+                            $this->_putString($value, $j * 8, $v);
                             $j++;
                         }
                         break;
-- 
cgit v1.2.3


From f5891fa46a904172ba403360a977c215c81cd255 Mon Sep 17 00:00:00 2001
From: Gerrit Uitslag <klapinklapin@gmail.com>
Date: Wed, 16 Oct 2013 12:06:29 +0200
Subject: fix some Only vars assigned by reference

---
 inc/JpegMeta.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'inc/JpegMeta.php')

diff --git a/inc/JpegMeta.php b/inc/JpegMeta.php
index 87c95103a..231fda083 100644
--- a/inc/JpegMeta.php
+++ b/inc/JpegMeta.php
@@ -1452,7 +1452,7 @@ class JpegMeta {
             if ($this->_markers[$i]['marker'] == 0xE1) {
                 $signature = $this->_getFixedString($this->_markers[$i]['data'], 0, 29);
                 if ($signature == "http://ns.adobe.com/xap/1.0/\0") {
-                    $data =& substr($this->_markers[$i]['data'], 29);
+                    $data = substr($this->_markers[$i]['data'], 29);
                     break;
                 }
             }
@@ -2337,7 +2337,7 @@ class JpegMeta {
     function _readIPTC(&$data, $pos = 0) {
         $totalLength = strlen($data);
 
-        $IPTCTags =& $this->_iptcTagNames();
+        $IPTCTags = $this->_iptcTagNames();
 
         while ($pos < ($totalLength - 5)) {
             $signature = $this->_getShort($data, $pos);
-- 
cgit v1.2.3