1 files changed, 29 insertions, 28 deletions

diff --git a/includes/media/JpegMetadataExtractor.php b/includes/media/JpegMetadataExtractor.php
index 8d7e43b9..6ff07ed2 100644
--- a/includes/media/JpegMetadataExtractor.php
+++ b/includes/media/JpegMetadataExtractor.php
@@ -25,7 +25,7 @@
  * Class for reading jpegs and extracting metadata.
  * see also BitmapMetadataHandler.
  *
- * Based somewhat on GIFMetadataExtrator.
+ * Based somewhat on GIFMetadataExtractor.
  *
  * @ingroup Media
  */
@@ -37,16 +37,16 @@ class JpegMetadataExtractor {
 	// that many segments. Your average file has about 10.
 
 	/** Function to extract metadata segments of interest from jpeg files
-	* based on GIFMetadataExtractor.
-	*
-	* we can almost use getimagesize to do this
-	* but gis doesn't support having multiple app1 segments
-	* and those can't extract xmp on files containing both exif and xmp data
-	*
-	* @param String $filename name of jpeg file
-	* @return Array of interesting segments.
-	* @throws MWException if given invalid file.
-	*/
+	 * based on GIFMetadataExtractor.
+	 *
+	 * we can almost use getimagesize to do this
+	 * but gis doesn't support having multiple app1 segments
+	 * and those can't extract xmp on files containing both exif and xmp data
+	 *
+	 * @param string $filename name of jpeg file
+	 * @return Array of interesting segments.
+	 * @throws MWException if given invalid file.
+	 */
 	static function segmentSplitter ( $filename ) {
 		$showXMP = function_exists( 'xml_parser_create_ns' );
 
@@ -129,7 +129,7 @@ class JpegMetadataExtractor {
 					// whatever...
 					$segments["XMP"] = substr( $temp, 29 );
 					wfDebug( __METHOD__ . ' Found XMP section with wrong app identifier '
-						. "Using anyways.\n" ); 
+						. "Using anyways.\n" );
 				} elseif ( substr( $temp, 0, 6 ) === "Exif\0\0" ) {
 					// Just need to find out what the byte order is.
 					// because php's exif plugin sucks...
@@ -165,10 +165,11 @@ class JpegMetadataExtractor {
 	}
 
 	/**
-	* Helper function for jpegSegmentSplitter
-	* @param &$fh FileHandle for jpeg file
-	* @return string data content of segment.
-	*/
+	 * Helper function for jpegSegmentSplitter
+	 * @param &$fh FileHandle for jpeg file
+	 * @throws MWException
+	 * @return string data content of segment.
+	 */
 	private static function jpegExtractMarker( &$fh ) {
 		$size = wfUnpack( "nint", fread( $fh, 2 ), 2 );
 		if ( $size['int'] <= 2 ) {
@@ -182,18 +183,18 @@ class JpegMetadataExtractor {
 	}
 
 	/**
-	* This reads the photoshop image resource.
-	* Currently it only compares the iptc/iim hash
-	* with the stored hash, which is used to determine the precedence
-	* of the iptc data. In future it may extract some other info, like
-	* url of copyright license.
-	*
-	* This should generally be called by BitmapMetadataHandler::doApp13()
-	*
-	* @param String $app13 photoshop psir app13 block from jpg.
-	* @throws MWException (It gets caught next level up though)
-	* @return String if the iptc hash is good or not.
-	*/
+	 * This reads the photoshop image resource.
+	 * Currently it only compares the iptc/iim hash
+	 * with the stored hash, which is used to determine the precedence
+	 * of the iptc data. In future it may extract some other info, like
+	 * url of copyright license.
+	 *
+	 * This should generally be called by BitmapMetadataHandler::doApp13()
+	 *
+	 * @param string $app13 photoshop psir app13 block from jpg.
+	 * @throws MWException (It gets caught next level up though)
+	 * @return String if the iptc hash is good or not.
+	 */
 	public static function doPSIR ( $app13 ) {
 		if ( !$app13 ) {
 			throw new MWException( "No App13 segment given" );