diff options
| author | Christopher Smith <chris@jalakai.co.uk> | 2013-10-21 18:54:34 +0100 |
|---|---|---|
| committer | Christopher Smith <chris@jalakai.co.uk> | 2013-10-21 18:54:34 +0100 |
| commit | fa457f5d82989812f1961cb9643c0b55824ba0b3 (patch) | |
| tree | ea4e6325a9a9d760f6603758449a70ac50cc052d /inc/JpegMeta.php | |
| parent | 4b94edc8e8badb6bcdc25b41f73310a8e323ba92 (diff) | |
| parent | 7951a37379700f564a20c882a920086b49c473c8 (diff) | |
| download | rpg-fa457f5d82989812f1961cb9643c0b55824ba0b3.tar.gz rpg-fa457f5d82989812f1961cb9643c0b55824ba0b3.tar.bz2 | |
Merge branch 'master' into FS#2867
Diffstat (limited to 'inc/JpegMeta.php')
| -rw-r--r-- | inc/JpegMeta.php | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/inc/JpegMeta.php b/inc/JpegMeta.php index ba6a2b5bb..cb1772736 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; @@ -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'] = ""; } @@ -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; } } @@ -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; @@ -2335,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); |