http://www.mediawiki.org/wiki/Special:Code/MediaWiki/72278
Revision: 72278
Author: daniel
Date: 2010-09-03 11:59:06 +0000 (Fri, 03 Sep 2010)
Log Message:
-----------
fixed bugs in imageinfo parser, especially effecting images generated by
photoshop. should fix some (most?) problems reported in bug 24984
Modified Paths:
--------------
trunk/extensions/PagedTiffHandler/PagedTiffHandler.image.php
trunk/extensions/PagedTiffHandler/PagedTiffHandler.php
Modified: trunk/extensions/PagedTiffHandler/PagedTiffHandler.image.php
===================================================================
--- trunk/extensions/PagedTiffHandler/PagedTiffHandler.image.php
2010-09-03 11:51:41 UTC (rev 72277)
+++ trunk/extensions/PagedTiffHandler/PagedTiffHandler.image.php
2010-09-03 11:59:06 UTC (rev 72278)
@@ -186,7 +186,7 @@
return $this->_meta;
}
- private function addPageEntry( $entry, &$metadata, &$prevPage ) {
+ private function addPageEntry( &$entry, &$metadata, &$prevPage ) {
if ( !isset( $entry['page'] ) ) {
$entry['page'] = $prevPage +1;
} else {
@@ -266,7 +266,6 @@
if ( !$bypass ) {
$data['warnings'][] = $msg;
- break;
}
} else if ( preg_match('/^\s*(.*?)\s*:\s*(.*?)\s*$/',
$row, $m) ) {
$key = $m[1];
Modified: trunk/extensions/PagedTiffHandler/PagedTiffHandler.php
===================================================================
--- trunk/extensions/PagedTiffHandler/PagedTiffHandler.php 2010-09-03
11:51:41 UTC (rev 72277)
+++ trunk/extensions/PagedTiffHandler/PagedTiffHandler.php 2010-09-03
11:59:06 UTC (rev 72278)
@@ -123,7 +123,9 @@
$wgMediaHandlers['image/tiff'] = 'PagedTiffHandler';
$wgHooks['LanguageGetMagic'][] = 'PagedTiffHandler::addTiffLossyMagicWordLang';
-define('TIFF_METADATA_VERSION', '1.0');
+define('TIFF_METADATA_VERSION', '1.1');
+# 1.0: initial
+# 1.1: fixed bugs in imageinfo parser
//$wgHooks['PagedTiffHandlerRenderCommand'][] =
'PagedTiffHandler::renderCommand';
//$wgHooks['PagedTiffHandlerTiffData'][] = 'PagedTiffImage::tiffData';
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
