kashire/lainchan
4
0
Fork 0
Code Issues 9 Pull Requests Releases Wiki Activity

Bugfix: exif_read_data() Incorrect APP1 Exif Identifier Code

Browse Source
This commit is contained in:
Michael Foster 2013-08-04 23:02:15 -04:00
parent 0c829aa8f6
commit 373fb99a7f
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
inc/image.php
View File

@ -371,7 +371,7 @@ class ImageConvert extends ImageBase {
// For when -auto-orient doesn't exist (older versions) // For when -auto-orient doesn't exist (older versions)
static public function jpeg_exif_orientation($src, $exif = false) { static public function jpeg_exif_orientation($src, $exif = false) {
if (!$exif) { if (!$exif) {
$exif = exif_read_data($src); $exif = @exif_read_data($src);
if (!isset($exif['Orientation'])) if (!isset($exif['Orientation']))
return false; return false;
} }

2
post.php
View File

@ -452,7 +452,7 @@ if (isset($_POST['delete'])) {
// Currently only works with the 'convert' option selected but it could easily be expanded to work with the rest if you can be bothered. // Currently only works with the 'convert' option selected but it could easily be expanded to work with the rest if you can be bothered.
if (!($config['redraw_image'] || (($config['strip_exif'] && !$config['use_exiftool']) && ($post['extension'] == 'jpg' || $post['extension'] == 'jpeg')))) { if (!($config['redraw_image'] || (($config['strip_exif'] && !$config['use_exiftool']) && ($post['extension'] == 'jpg' || $post['extension'] == 'jpeg')))) {
if (in_array($config['thumb_method'], array('convert', 'convert+gifsicle', 'gm', 'gm+gifsicle'))) { if (in_array($config['thumb_method'], array('convert', 'convert+gifsicle', 'gm', 'gm+gifsicle'))) {
$exif = exif_read_data($upload); $exif = @exif_read_data($upload);
$gm = in_array($config['thumb_method'], array('gm', 'gm+gifsicle')); $gm = in_array($config['thumb_method'], array('gm', 'gm+gifsicle'));
if (isset($exif['Orientation']) && $exif['Orientation'] != 1) { if (isset($exif['Orientation']) && $exif['Orientation'] != 1) {
if ($config['convert_manual_orient']) { if ($config['convert_manual_orient']) {