* @ingroup Media
*/
class BitmapHandler extends ImageHandler {
- /**
- * Override parent method to add crop to param map.
- */
- public function getParamMap() {
- return array(
- 'img_width' => 'width',
- 'img_crop' => 'crop',
- );
- }
-
- /**
- * Override param map to validate the crop param.
- */
- public function validateParam( $name, $value ) {
- if ( $name == 'crop' ) {
- return $this->splitCropParam( $value ) !== false;
- } else {
- return parent::validateParam( $name, $value );
- }
- }
- /**
- * Split the crop param into up to 4 parts and convert them to integers.
- * Returns false in case of malformed param.
- */
- protected function splitCropParam( $value ) {
- $parts = explode( 'x', $value );
- if ( count( $parts ) > 4 )
- return false;
- foreach ( $parts as &$part ) {
- $intVal = intval( $part );
- if ( $intVal === 0 && !( $part === '0' || $part === '' ) )
- return false;
- if ( $intVal < 0 )
- return false;
-
- $part = $intVal;
- }
-
- return $parts;
- }
-
- /**
- * Override parent method to check for optional crop parameter in param
- * string.
- */
- public function parseParamString( $str ) {
- $res = parent::parseParamString( $str );
- if ( $res === false ) {
- $m = false;
- if ( preg_match( '/^(\d+)px-([x0-9])crop$/', $str, $m ) ) {
- return array( 'width' => $m[1], 'crop' => $m[2] );
- } else {
- return false;
- }
- }
- }
- /**
- * Add the crop parameter the string generated by the parent.
- */
- public function makeParamString( $params ) {
- $res = parent::makeParamString( $params );
- if ( !empty( $params['crop'] ) )
- $res .= '-'.implode( 'x', $params['crop'] ).'crop';
- return $res;
- }
-
- public function normaliseParams( $image, &$params ) {
+ function normaliseParams( $image, &$params ) {
global $wgMaxImageArea;
- # Parent fills in width, height and page and normalizes them.
if ( !parent::normaliseParams( $image, $params ) ) {
return false;
}
$params['physicalHeight'] = $srcHeight;
return true;
}
-
- # Validate crop params
- if ( isset( $params['crop'] ) ) {
- # $cropParams = array( x, y, width, height );
- $cropParams = $this->splitCropParam( $params['crop'] );
- # Fill up params
- switch ( count( $cropParams ) ) {
- # All fall through
- case 1:
- $cropParams[1] = 0;
- case 2:
- $cropParams[2] = $srcWidth - $cropParams[0];
- case 3:
- $cropParams[3] = $srcHeight - $cropParams[1];
- }
- $cx = $cropParams[0] + $cropParams[2];
- $cy = $cropParams[1] + $cropParams[3];
- $targetWidth = $cropParams[2];
- $targetHeight = $cropParams[3];
- # Can't go outside image
- if ( $cx > $srcWidth || $cy > $srcHeight ) {
- # TODO: Maybe should fail gracefully?
- return false;
- }
- if ( $targetWidth == $srcWidth && $targetHeight == $srcHeight )
- {
- # No need to crop
- $params['crop'] = false;
- }
- else
- {
- $params['crop'] = $cropParams;
- $params['height'] = $params['physicalHeight'] = File::scaleHeight(
- $targetWidth, $targetHeight, $params['width'] );
- }
- } else {
- $params['crop'] = false;
- }
return true;
}
- /**
- * Function that returns the number of pixels to be thumbnailed.
- * Intended for animated GIFs to multiply by the number of frames.
- */
- protected function getImageArea( $image, $width, $height ) {
+ // Function that returns the number of pixels to be thumbnailed.
+ // Intended for animated GIFs to multiply by the number of frames.
+ function getImageArea( $image, $width, $height ) {
return $width * $height;
}
- public function doTransform( $image, $dstPath, $dstUrl, $params, $flags = 0 ) {
+ function doTransform( $image, $dstPath, $dstUrl, $params, $flags = 0 ) {
global $wgUseImageMagick, $wgImageMagickConvertCommand, $wgImageMagickTempDir;
global $wgCustomConvertCommand, $wgUseImageResize;
global $wgSharpenParameter, $wgSharpenReductionThreshold;
} else {
$tempEnv = '';
}
-
- if ( $params['crop'] ) {
- $crop = $params['crop'];
- $cropCmd = "-crop {$crop[2]}x{$crop[3]}+{$crop[0]}+{$crop[1]}";
- }
- else
- $cropCmd = '';
# Specify white background color, will be used for transparent images
# in Internet Explorer/Windows instead of default black.
$cmd =
$tempEnv .
wfEscapeShellArg($wgImageMagickConvertCommand) .
- " {$cropCmd} {$quality} -background white -size {$physicalWidth} ".
+ " {$quality} -background white -size {$physicalWidth} ".
wfEscapeShellArg($srcPath . $frame) .
$animation .
// For the -resize option a "!" is needed to force exact size,
}
}
- public static function imageJpegWrapper( $dst_image, $thumbPath ) {
+ static function imageJpegWrapper( $dst_image, $thumbPath ) {
imageinterlace( $dst_image );
imagejpeg( $dst_image, $thumbPath, 95 );
}
- public function getMetadata( $image, $filename ) {
+ function getMetadata( $image, $filename ) {
global $wgShowEXIF;
if( $wgShowEXIF && file_exists( $filename ) ) {
$exif = new Exif( $filename );
}
}
- public function getMetadataType( $image ) {
+ function getMetadataType( $image ) {
return 'exif';
}
- public function isMetadataValid( $image, $metadata ) {
+ function isMetadataValid( $image, $metadata ) {
global $wgShowEXIF;
if ( !$wgShowEXIF ) {
# Metadata disabled and so an empty field is expected
* @return array of strings
* @access private
*/
- public function visibleMetadataFields() {
+ function visibleMetadataFields() {
$fields = array();
$lines = explode( "\n", wfMsgForContent( 'metadata-fields' ) );
foreach( $lines as $line ) {
return $fields;
}
- public function formatMetadata( $image ) {
+ function formatMetadata( $image ) {
$result = array(
'visible' => array(),
'collapsed' => array()
dépôts / lhc / web / wiklou.git / commitdiff