summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2017-01-10 11:30:38 +0100
committerAndrey Andreev <narf@devilix.net>2017-01-10 11:30:38 +0100
commit8f9ab65270ae033c5637f8a7d26ae834e9a71d5e (patch)
tree7ff1d16c6cbbe8bf0abecfabf242dfda29fcf3a6
parentfa986fe738363069d8ae331f0ae331521cd895d3 (diff)
[ci skip] CI_Image_lib to set gd.jpeg_ignore_warning = 1
See #4967
-rw-r--r--system/libraries/Image_lib.php10
-rw-r--r--user_guide_src/source/changelog.rst4
2 files changed, 14 insertions, 0 deletions
diff --git a/system/libraries/Image_lib.php b/system/libraries/Image_lib.php
index 9ec44da0c..88c9e7ede 100644
--- a/system/libraries/Image_lib.php
+++ b/system/libraries/Image_lib.php
@@ -392,6 +392,16 @@ class CI_Image_lib {
$this->initialize($props);
}
+ /**
+ * A work-around for some improperly formatted, but
+ * usable JPEGs; known to be produced by Samsung
+ * smartphones' front-facing cameras.
+ *
+ * @see https://github.com/bcit-ci/CodeIgniter/issues/4967
+ * @see https://bugs.php.net/bug.php?id=72404
+ */
+ ini_set('gd.jpeg_ignore_warning', 1);
+
log_message('info', 'Image Lib Class Initialized');
}
diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 47b984eff..64ebd61a1 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -7,6 +7,10 @@ Version 3.1.4
Release Date: Not Released
+- General Changes
+
+ - Updated the :doc:`Image Manipulation Library <libraries/image_lib>` to work-around an issue with some JPEGs when using GD.
+
Bug fixes for 3.1.4
-------------------