From 35740d5b64eeeb02a37fa08aa367dad9baa2eae0 Mon Sep 17 00:00:00 2001 From: Brian Wolff Date: Fri, 17 Jun 2011 03:37:59 +0000 Subject: [PATCH] (follow-up r86567) per CR rename the class JpegOrTiffHandler to ExifBitmapHandler. --- RELEASE-NOTES-1.19 | 3 ++- includes/AutoLoader.php | 2 +- includes/media/{JpegOrTiff.php => ExifBitmap.php} | 2 +- includes/media/Jpeg.php | 9 +++++---- includes/media/Tiff.php | 4 ++-- 5 files changed, 11 insertions(+), 9 deletions(-) rename includes/media/{JpegOrTiff.php => ExifBitmap.php} (98%) diff --git a/RELEASE-NOTES-1.19 b/RELEASE-NOTES-1.19 index 57640eb290..d1a49bc14b 100644 --- a/RELEASE-NOTES-1.19 +++ b/RELEASE-NOTES-1.19 @@ -95,7 +95,8 @@ production. as lastTabIndex(). * (bug 29332) Warn if user requests mediawiki-announce subscription but does not enter an e-mail address. -* (bug 25375) Add canonical namespaces to JavaScript "wgNamespaceIds" +* (bug 25375) Add canonical namespaces to JavaScript "wgNamespaceIds" +* The class JpegOrTiffHandler was renamed ExifBitmapHandler. === API changes in 1.19 === * BREAKING CHANGE: action=watch now requires POST and token. diff --git a/includes/AutoLoader.php b/includes/AutoLoader.php index ab53ab3d17..ab86371022 100644 --- a/includes/AutoLoader.php +++ b/includes/AutoLoader.php @@ -528,7 +528,7 @@ $wgAutoloadLocalClasses = array( 'IPTC' => 'includes/media/IPTC.php', 'JpegHandler' => 'includes/media/Jpeg.php', 'JpegMetadataExtractor' => 'includes/media/JpegMetadataExtractor.php', - 'JpegOrTiffHandler' => 'includes/media/JpegOrTiff.php', + 'ExifBitmapHandler' => 'includes/media/ExifBitmap.php', 'MediaHandler' => 'includes/media/Generic.php', 'MediaTransformError' => 'includes/media/MediaTransformOutput.php', 'MediaTransformOutput' => 'includes/media/MediaTransformOutput.php', diff --git a/includes/media/JpegOrTiff.php b/includes/media/ExifBitmap.php similarity index 98% rename from includes/media/JpegOrTiff.php rename to includes/media/ExifBitmap.php index d48350053b..b63ef18136 100644 --- a/includes/media/JpegOrTiff.php +++ b/includes/media/ExifBitmap.php @@ -10,7 +10,7 @@ * * @ingroup Media */ -class JpegOrTiffHandler extends BitmapHandler { +class ExifBitmapHandler extends BitmapHandler { const BROKEN_FILE = '-1'; // error extracting metadata const OLD_BROKEN_FILE = '0'; // outdated error extracting metadata. diff --git a/includes/media/Jpeg.php b/includes/media/Jpeg.php index d8f713db11..7033409b0d 100644 --- a/includes/media/Jpeg.php +++ b/includes/media/Jpeg.php @@ -8,11 +8,12 @@ * JPEG specific handler. * Inherits most stuff from BitmapHandler, just here to do the metadata handler differently. * - * Metadata stuff common to Jpeg and built-in Tiff (not PagedTiffHandler) is in JpegOrTiffHandler. + * Metadata stuff common to Jpeg and built-in Tiff (not PagedTiffHandler) is + * in ExifBitmapHandler. * * @ingroup Media */ -class JpegHandler extends JpegOrTiffHandler { +class JpegHandler extends ExifBitmapHandler { function getMetadata ( $image, $filename ) { try { @@ -28,7 +29,7 @@ class JpegHandler extends JpegOrTiffHandler { // BitmapMetadataHandler throws an exception in certain exceptional cases like if file does not exist. wfDebug( __METHOD__ . ': ' . $e->getMessage() . "\n" ); - /* This used to use 0 (JpegOrTiffHandler::OLD_BROKEN_FILE) for the cases + /* This used to use 0 (ExifBitmapHandler::OLD_BROKEN_FILE) for the cases * * No metadata in the file * * Something is broken in the file. * However, if the metadata support gets expanded then you can't tell if the 0 is from @@ -37,7 +38,7 @@ class JpegHandler extends JpegOrTiffHandler { * Thus switch to using -1 to denote only a broken file, and use an array with only * MEDIAWIKI_EXIF_VERSION to denote no props. */ - return JpegOrTiffHandler::BROKEN_FILE; + return ExifBitmapHandler::BROKEN_FILE; } } diff --git a/includes/media/Tiff.php b/includes/media/Tiff.php index 64710ce3d1..2674267424 100644 --- a/includes/media/Tiff.php +++ b/includes/media/Tiff.php @@ -11,7 +11,7 @@ * * @ingroup Media */ -class TiffHandler extends JpegOrTiffHandler { +class TiffHandler extends ExifBitmapHandler { /** * Conversion to PNG for inline display can be disabled here... @@ -63,7 +63,7 @@ class TiffHandler extends JpegOrTiffHandler { $data['MEDIAWIKI_EXIF_VERSION'] = Exif::version(); return serialize( $data ); } else { - return JpegOrTiffHandler::BROKEN_FILE; + return ExifBitmapHandler::BROKEN_FILE; } } else { return ''; -- 2.20.1