Merge pull request #48 from FrivalszkyP/master

Miljar · Miljar · commit 002d07f2806a · 2016-02-16T19:52:48.000+01:00
Support for Unicode Exiftool output added
diff --git a/lib/PHPExif/Adapter/Exiftool.php b/lib/PHPExif/Adapter/Exiftool.php
@@ -110,7 +110,7 @@ public function getExifFromFile($file)
             )
         );
 
-        $data = json_decode($result, true);
+        $data = json_decode(utf8_encode($result), true);
 
         // map the data:
         $mapper = $this->getMapper();

Original file line number	Diff line number	Diff line change
`@@ -110,7 +110,7 @@ public function getExifFromFile($file)`
`110`	`110`	`)`
`111`	`111`	`);`
`112`	`112`
`113`		`- $data = json_decode($result, true);`
	`113`	`+ $data = json_decode(utf8_encode($result), true);`
`114`	`114`
`115`	`115`	`// map the data:`
`116`	`116`	`$mapper = $this->getMapper();`