Merge to trunk everything in img_metadata branch.

[lhc/web/wiklou.git] / includes / media / Bitmap.php

diff --git a/includes/media/Bitmap.php b/includes/media/Bitmap.php
index ff2e56d..a9ebd3f 100644 (file)
--- a/includes/media/Bitmap.php
+++ b/includes/media/Bitmap.php
@@ -670,8 +670,19 @@ class BitmapHandler extends ImageHandler {
                imagejpeg( $dst_image, $thumbPath, 95 );
        }
 
-
+       /**
+        * Its unclear if anything still uses this
+        * as jpeg is now in its own subclass.
+        *
+        * And really each media handler should use a
+        * different getMetadata, as the formats aren't
+        * all that similar and usually have different
+        * metadata needs.
+        *
+        * @deprecated
+        */
        function getMetadata( $image, $filename ) {
+               wfDeprected( __METHOD__ );
                global $wgShowEXIF;
                if ( $wgShowEXIF && file_exists( $filename ) ) {
                        $exif = new Exif( $filename );