dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "copy paste comment should probably have end instead of start"
[lhc/web/wiklou.git]
/
includes
/
media
/
JpegMetadataExtractor.php
diff --git
a/includes/media/JpegMetadataExtractor.php
b/includes/media/JpegMetadataExtractor.php
index
121652f
..
c7030eb
100644
(file)
--- a/
includes/media/JpegMetadataExtractor.php
+++ b/
includes/media/JpegMetadataExtractor.php
@@
-87,7
+87,7
@@
class JpegMetadataExtractor {
}
$buffer = fread( $fh, 1 );
}
$buffer = fread( $fh, 1 );
- while( $buffer === "\xFF" && !feof( $fh ) ) {
+ while
( $buffer === "\xFF" && !feof( $fh ) ) {
// Skip through any 0xFF padding bytes.
$buffer = fread( $fh, 1 );
}
// Skip through any 0xFF padding bytes.
$buffer = fread( $fh, 1 );
}
@@
-111,7
+111,7
@@
class JpegMetadataExtractor {
if ( $com === $oldCom ) {
$segments["COM"][] = $oldCom;
} else {
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" ) {
}
} elseif ( $buffer === "\xE1" ) {
@@
-140,7
+140,7
@@
class JpegMetadataExtractor {
} elseif ( $byteOrderMarker === 'II' ) {
$segments['byteOrder'] = 'LE';
} else {
} elseif ( $byteOrderMarker === 'II' ) {
$segments['byteOrder'] = 'LE';
} else {
- wfDebug( __METHOD__ .
' Invalid byte ordering?!'
);
+ wfDebug( __METHOD__ .
" Invalid byte ordering?!\n"
);
}
}
} elseif ( $buffer === "\xED" ) {
}
}
} 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 );
} 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 );
}
fseek( $fh, $size['int'] - 2, SEEK_CUR );
}
@@
-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.
// 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;
$offset += 4; // 4bytes length field;
@@
-267,7
+271,9
@@
class JpegMetadataExtractor {
// if odd, add 1 to length to account for
// null pad byte.
// 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'];
}
$offset += $lenData['len'];
}