diff options
| author | Jérémy DECOOL <contact@jdecool.fr> | 2016-09-29 07:36:33 +0200 |
|---|---|---|
| committer | Jérémy DECOOL <jdecool@users.noreply.github.com> | 2016-09-29 07:48:18 +0200 |
| commit | c46dcf4786223ce5d28f1c53e8e2b5afe41ae5ae (patch) | |
| tree | e9ce55bda87398566088ccf6d909f65fff2a8c19 | |
| parent | 368a607aa4b61d324180bcb5f83bd9e0898a8536 (diff) | |
| download | ImageWorkshop-origin/HEAD.zip ImageWorkshop-origin/HEAD.tar.gz ImageWorkshop-origin/HEAD.tar.bz2 | |
Set PHP exif extension as optionalHEADorigin/masterorigin/HEADmaster
| -rw-r--r-- | composer.json | 6 | ||||
| -rw-r--r-- | src/PHPImageWorkshop/ImageWorkshop.php | 5 |
2 files changed, 7 insertions, 4 deletions
diff --git a/composer.json b/composer.json index 34c0788..fcbad42 100644 --- a/composer.json +++ b/composer.json @@ -18,12 +18,14 @@ ], "require": { "php": ">=5.3.0", - "ext-gd": "*", - "ext-exif": "*" + "ext-gd": "*" }, "require-dev": { "phpunit/phpunit": "~4.5" }, + "suggest": { + "ext-exif": "Allows to read and keep images EXIF data" + }, "autoload": { "psr-0": { "PHPImageWorkshop": "src" } } diff --git a/src/PHPImageWorkshop/ImageWorkshop.php b/src/PHPImageWorkshop/ImageWorkshop.php index f3a4650..bdedb20 100644 --- a/src/PHPImageWorkshop/ImageWorkshop.php +++ b/src/PHPImageWorkshop/ImageWorkshop.php @@ -73,8 +73,9 @@ class ImageWorkshop switch ($mimeContentType) {
case 'jpeg':
$image = imageCreateFromJPEG($path);
- if (false === ($exif = @read_exif_data($path))) {
- $exif = array();
+
+ if (function_exists('read_exif_data') && false !== ($data = @read_exif_data($path))) {
+ $exif = $data;
}
break;
|