Fix 1548 (#55)

* New MapperAbstract class with a recursive trim
* Support IPTC:CopyrightNotice
* Support more EXIF tags
* Support EXIF ImageDescription
* Add more test images
* Fix the GPS rounding code
* fix Copyrights

Co-authored-by: ildyria <[email protected]>

Author: kamil4

CHANGELOG.rst

@@ -1,4 +1,5 @@
-Copyright (C) 2013 Tom Van Herreweghe, http://theanalogguy.be
+Copyright (C) 2013-2019 Tom Van Herreweghe, http://theanalogguy.be
+Copyright (C) 2020 LycheeOrg, https://lycheeorg.github.io
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in

LICENSE

@@ -1,13 +1,4 @@
 <?php
-/**
- * PHP Exif Reader Adapter Abstract: Common functionality for adapters
- *
- * @link        http://github.com/miljar/PHPExif for the canonical source repository
- * @copyright   Copyright (c) 2013 Tom Van Herreweghe <[email protected]>
- * @license     http://github.com/miljar/PHPExif/blob/master/LICENSE MIT License
- * @category    PHPExif
- * @package     Reader
- */
 
 namespace PHPExif\Adapter;
 

lib/PHPExif/Adapter/AdapterAbstract.php

@@ -1,12 +1,5 @@
 <?php
 /**
- * PHP Exif Reader Adapter Interface: Defines the interface for reader adapters
- *
- * @link        http://github.com/miljar/PHPExif for the canonical source repository
- * @copyright   Copyright (c) 2013 Tom Van Herreweghe <[email protected]>
- * @license     http://github.com/miljar/PHPExif/blob/master/LICENSE MIT License
- * @category    PHPExif
- * @package     Reader
  * @codeCoverageIgnore
  */
 

lib/PHPExif/Adapter/AdapterInterface.php

@@ -1,13 +1,4 @@
 <?php
-/**
- * PHP Exif Exiftool Reader Adapter
- *
- * @link        http://github.com/miljar/PHPExif for the canonical source repository
- * @copyright   Copyright (c) 2013 Tom Van Herreweghe <[email protected]>
- * @license     http://github.com/miljar/PHPExif/blob/master/LICENSE MIT License
- * @category    PHPExif
- * @package     Reader
- */
 
 namespace PHPExif\Adapter;
 

lib/PHPExif/Adapter/Exiftool.php

@@ -1,13 +1,4 @@
 <?php
-/**
- * PHP Exif Imagick Reader Adapter
- *
- * @link        http://github.com/miljar/PHPExif for the canonical source repository
- * @copyright   Copyright (c) 2013 Tom Van Herreweghe <[email protected]>
- * @license     http://github.com/miljar/PHPExif/blob/master/LICENSE MIT License
- * @category    PHPExif
- * @package     Reader
- */
 
 namespace PHPExif\Adapter;
 
@@ -83,6 +74,8 @@ public function getExifFromFile(string $file) : Exif
         }
 
         $data = array_merge($data_exif, $data_iptc, $additional_data);
+        // Force UTF8 encoding
+        $data = $this->convertToUTF8($data);
 
         // map the data:
         $mapper = $this->getMapper();

lib/PHPExif/Adapter/ImageMagick.php

@@ -1,19 +1,9 @@
 <?php
-/**
- * PHP Exif Native Reader Adapter
- *
- * @link        http://github.com/miljar/PHPExif for the canonical source repository
- * @copyright   Copyright (c) 2013 Tom Van Herreweghe <[email protected]>
- * @license     http://github.com/miljar/PHPExif/blob/master/LICENSE MIT License
- * @category    PHPExif
- * @package     Reader
- */
 
 namespace PHPExif\Adapter;
 
 use PHPExif\Exif;
 use Safe\Exceptions\ImageException;
-use Throwable;
 
 use function Safe\mime_content_type;
 use function Safe\filesize;
@@ -229,7 +219,7 @@ public function getExifFromFile(string $file) : Exif
                 // Fail silently
             }
         }
-        
+
         // Force UTF8 encoding
         $data = $this->convertToUTF8($data);
 

lib/PHPExif/Adapter/Native.php

@@ -1,12 +1,5 @@
 <?php
 /**
- * PHP Exif Reader Adapter Interface: Defines the interface for reader adapters
- *
- * @link        http://github.com/miljar/PHPExif for the canonical source repository
- * @copyright   Copyright (c) 2013 Tom Van Herreweghe <[email protected]>
- * @license     http://github.com/miljar/PHPExif/blob/master/LICENSE MIT License
- * @category    PHPExif
- * @package     Reader
  * @codeCoverageIgnore
  */
 

lib/PHPExif/Adapter/NoAdapterException.php

@@ -1,13 +1,4 @@
 <?php
-/**
- * PHP Exif Reader: Reads EXIF metadata from a file, without having to install additional PHP modules
- *
- * @link        http://github.com/miljar/PHPExif for the canonical source repository
- * @copyright   Copyright (c) 2013 Tom Van Herreweghe <[email protected]>
- * @license     http://github.com/miljar/PHPExif/blob/master/LICENSE MIT License
- * @category    PHPExif
- * @package     Exif
- */
 
 namespace PHPExif;
 
@@ -20,7 +11,6 @@
  *
  * @category    PHPExif
  * @package     Exif
- * @
  */
 class Exif
 {

lib/PHPExif/Exif.php

@@ -1,12 +1,5 @@
 <?php
 /**
- * PHP Exif Hydrator Interface: Defines the interface for a hydrator
- *
- * @link        http://github.com/miljar/PHPExif for the canonical source repository
- * @copyright   Copyright (c) 2015 Tom Van Herreweghe <[email protected]>
- * @license     http://github.com/miljar/PHPExif/blob/master/LICENSE MIT License
- * @category    PHPExif
- * @package     Hydrator
  * @codeCoverageIgnore
  */