diff options
Diffstat (limited to 'includes/media/JpegMetadataExtractor.php')
| -rw-r--r-- | includes/media/JpegMetadataExtractor.php | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/includes/media/JpegMetadataExtractor.php b/includes/media/JpegMetadataExtractor.php index 6ff07ed2..c7030eba 100644 --- a/includes/media/JpegMetadataExtractor.php +++ b/includes/media/JpegMetadataExtractor.php @@ -47,7 +47,7 @@ class JpegMetadataExtractor { * @return Array of interesting segments. * @throws MWException if given invalid file. */ - static function segmentSplitter ( $filename ) { + static function segmentSplitter( $filename ) { $showXMP = function_exists( 'xml_parser_create_ns' ); $segmentCount = 0; @@ -87,7 +87,7 @@ class JpegMetadataExtractor { } $buffer = fread( $fh, 1 ); - while( $buffer === "\xFF" && !feof( $fh ) ) { + while ( $buffer === "\xFF" && !feof( $fh ) ) { // Skip through any 0xFF padding bytes. $buffer = fread( $fh, 1 ); } @@ -111,7 +111,7 @@ class JpegMetadataExtractor { if ( $com === $oldCom ) { $segments["COM"][] = $oldCom; } else { - wfDebug( __METHOD__ . ' Ignoring JPEG comment as is garbage.' ); + wfDebug( __METHOD__ . " Ignoring JPEG comment as is garbage.\n" ); } } elseif ( $buffer === "\xE1" ) { @@ -140,7 +140,7 @@ class JpegMetadataExtractor { } elseif ( $byteOrderMarker === 'II' ) { $segments['byteOrder'] = 'LE'; } else { - wfDebug( __METHOD__ . ' Invalid byte ordering?!' ); + wfDebug( __METHOD__ . " Invalid byte ordering?!\n" ); } } } elseif ( $buffer === "\xED" ) { @@ -155,7 +155,9 @@ class JpegMetadataExtractor { } else { // segment we don't care about, so skip $size = wfUnpack( "nint", fread( $fh, 2 ), 2 ); - if ( $size['int'] <= 2 ) throw new MWException( "invalid marker size in jpeg" ); + if ( $size['int'] <= 2 ) { + throw new MWException( "invalid marker size in jpeg" ); + } fseek( $fh, $size['int'] - 2, SEEK_CUR ); } @@ -195,7 +197,7 @@ class JpegMetadataExtractor { * @throws MWException (It gets caught next level up though) * @return String if the iptc hash is good or not. */ - public static function doPSIR ( $app13 ) { + public static function doPSIR( $app13 ) { if ( !$app13 ) { throw new MWException( "No App13 segment given" ); } @@ -243,7 +245,9 @@ class JpegMetadataExtractor { // PHP can take issue with very large unsigned ints and make them negative. // Which should never ever happen, as this has to be inside a segment // which is limited to a 16 bit number. - if ( $lenData['len'] < 0 ) throw new MWException( "Too big PSIR (" . $lenData['len'] . ')' ); + if ( $lenData['len'] < 0 ) { + throw new MWException( "Too big PSIR (" . $lenData['len'] . ')' ); + } $offset += 4; // 4bytes length field; @@ -267,7 +271,9 @@ class JpegMetadataExtractor { // if odd, add 1 to length to account for // null pad byte. - if ( $lenData['len'] % 2 == 1 ) $lenData['len']++; + if ( $lenData['len'] % 2 == 1 ) { + $lenData['len']++; + } $offset += $lenData['len']; } |