RPJosh
/
memories
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix exif orientation issues

old-stable24
Varun Patil 2022-10-17 19:16:03 -07:00
parent e2582c1509
commit 7b63ffc187
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/Exif.php
View File

@ -162,7 +162,7 @@ class Exif {
} }
private static function getExifFromLocalPathWithStaticProc(string &$path) { private static function getExifFromLocalPathWithStaticProc(string &$path) {
fwrite(self::$staticPipes[0], "$path\n-json\n-api\nQuickTimeUTC=1\n-execute\n"); fwrite(self::$staticPipes[0], "$path\n-json\n-api\nQuickTimeUTC=1\n-n\n-execute\n");
fflush(self::$staticPipes[0]); fflush(self::$staticPipes[0]);
$readyToken = "\n{ready}\n"; $readyToken = "\n{ready}\n";
@ -181,7 +181,7 @@ class Exif {
private static function getExifFromLocalPathWithSeparateProc(string &$path) { private static function getExifFromLocalPathWithSeparateProc(string &$path) {
$pipes = []; $pipes = [];
$proc = proc_open(['exiftool', '-api', 'QuickTimeUTC=1', '-json', $path], [ $proc = proc_open(['exiftool', '-api', 'QuickTimeUTC=1', '-n', '-json', $path], [
1 => array('pipe', 'w'), 1 => array('pipe', 'w'),
2 => array('pipe', 'w'), 2 => array('pipe', 'w'),
], $pipes); ], $pipes);
@ -207,7 +207,7 @@ class Exif {
public static function getExifFromStream(&$handle) { public static function getExifFromStream(&$handle) {
// Start exiftool and output to json // Start exiftool and output to json
$pipes = []; $pipes = [];
$proc = proc_open(['exiftool', '-api', 'QuickTimeUTC=1', '-json', '-fast', '-'], [ $proc = proc_open(['exiftool', '-api', 'QuickTimeUTC=1', '-n', '-json', '-fast', '-'], [
0 => array('pipe', 'rb'), 0 => array('pipe', 'rb'),
1 => array('pipe', 'w'), 1 => array('pipe', 'w'),
2 => array('pipe', 'w'), 2 => array('pipe', 'w'),
@ -323,8 +323,8 @@ class Exif {
$height = $exif['ImageHeight'] ?? 0; $height = $exif['ImageHeight'] ?? 0;
// Check if image is rotated and we need to swap width and height // Check if image is rotated and we need to swap width and height
$rotation = $exif['Rotation'] ?? 0; $rotation = $exif['Orientation'] ?? 0;
if ($rotation == 90 || $rotation == 270) { if (in_array($rotation, [5, 6, 7, 8])) {
return [$height, $width]; return [$height, $width];
} }