X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=includes%2Fmedia%2FDjVuHandler.php;h=ed62ba1f46a436b16805d6a0cea8f5d34d4e9f14;hb=fbbad5e8385dfe17f73bdc8a2d0c2cea2af517ef;hp=14074ef4ec9928b20658e23d873bf99c89b4604b;hpb=6bfa7c37540da7605e88c10caf0295ae8ff45723;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/media/DjVuHandler.php b/includes/media/DjVuHandler.php index 14074ef4ec..ed62ba1f46 100644 --- a/includes/media/DjVuHandler.php +++ b/includes/media/DjVuHandler.php @@ -32,7 +32,7 @@ class DjVuHandler extends ImageHandler { /** * @return bool */ - function isEnabled() { + public function isEnabled() { global $wgDjvuRenderer, $wgDjvuDump, $wgDjvuToXML; if ( !$wgDjvuRenderer || ( !$wgDjvuDump && !$wgDjvuToXML ) ) { wfDebug( "DjVu is disabled, please set \$wgDjvuRenderer and \$wgDjvuDump\n" ); @@ -130,7 +130,7 @@ class DjVuHandler extends ImageHandler { * @param array $params * @return array */ - function getScriptParams( $params ) { + protected function getScriptParams( $params ) { return [ 'width' => $params['width'], 'page' => $params['page'], @@ -252,7 +252,7 @@ class DjVuHandler extends ImageHandler { } /** - * Get metadata, unserializing it if neccessary. + * Get metadata, unserializing it if necessary. * * @param File $file The DjVu file in question * @return string XML metadata as a string. @@ -353,7 +353,7 @@ class DjVuHandler extends ImageHandler { return $this->getDjVuImage( $image, $path )->getImageSize(); } - function getThumbType( $ext, $mime, $params = null ) { + public function getThumbType( $ext, $mime, $params = null ) { global $wgDjvuOutputExtension; static $mime; if ( !isset( $mime ) ) { @@ -364,7 +364,7 @@ class DjVuHandler extends ImageHandler { return [ $wgDjvuOutputExtension, $mime ]; } - function getMetadata( $image, $path ) { + public function getMetadata( $image, $path ) { wfDebug( "Getting DjVu metadata for $path\n" ); $xml = $this->getDjVuImage( $image, $path )->retrieveMetaData(); @@ -380,17 +380,17 @@ class DjVuHandler extends ImageHandler { return 'djvuxml'; } - function isMetadataValid( $image, $metadata ) { + public function isMetadataValid( $image, $metadata ) { return !empty( $metadata ) && $metadata != serialize( [] ); } - function pageCount( File $image ) { + public function pageCount( File $image ) { $info = $this->getDimensionInfo( $image ); return $info ? $info['pageCount'] : false; } - function getPageDimensions( File $image, $page ) { + public function getPageDimensions( File $image, $page ) { $index = $page - 1; // MW starts pages at 1 $info = $this->getDimensionInfo( $image );