757a70ae0a
BitmapHandler has a lot of generic-ish functionality that could be re-usable by extension classes (Such as how it organizes $scalerParams array, or various image magick escaping methods). However it's combined with a lot of very format specific things, such as the shell-out call to image magick. Try to separate out the more generic stuff into TransformationalImageHandler. In order to do this, I also made canRotate, autoRotateEnabled, and getScalerType non-static. No extensions in our repo appeared to be using these methods, and they don't really make sense to be static (imo). In particular, I think code duplication can be reduced in PagedTiffHandler by extending this new class. See comments on I1b9a77a4a56eeb65. Change-Id: Id3a8b25a598942572cb5791a95e86054d7784961
280 lines
7.6 KiB
PHP
280 lines
7.6 KiB
PHP
<?php
|
|
/**
|
|
* Tests related to auto rotation.
|
|
*
|
|
* @group Media
|
|
* @group medium
|
|
*
|
|
* @todo covers tags
|
|
*/
|
|
class ExifRotationTest extends MediaWikiMediaTestCase {
|
|
|
|
protected function setUp() {
|
|
parent::setUp();
|
|
$this->checkPHPExtension( 'exif' );
|
|
|
|
$this->handler = new BitmapHandler();
|
|
|
|
$this->setMwGlobals( array(
|
|
'wgShowEXIF' => true,
|
|
'wgEnableAutoRotation' => true,
|
|
) );
|
|
}
|
|
|
|
/**
|
|
* Mark this test as creating thumbnail files.
|
|
*/
|
|
protected function createsThumbnails() {
|
|
return true;
|
|
}
|
|
|
|
/**
|
|
* @dataProvider provideFiles
|
|
*/
|
|
public function testMetadata( $name, $type, $info ) {
|
|
if ( !$this->handler->canRotate() ) {
|
|
$this->markTestSkipped( "This test needs a rasterizer that can auto-rotate." );
|
|
}
|
|
$file = $this->dataFile( $name, $type );
|
|
$this->assertEquals( $info['width'], $file->getWidth(), "$name: width check" );
|
|
$this->assertEquals( $info['height'], $file->getHeight(), "$name: height check" );
|
|
}
|
|
|
|
/**
|
|
* Same as before, but with auto-rotation set to auto.
|
|
*
|
|
* This sets scaler to image magick, which we should detect as
|
|
* supporting rotation.
|
|
* @dataProvider provideFiles
|
|
*/
|
|
public function testMetadataAutoRotate( $name, $type, $info ) {
|
|
$this->setMwGlobals( 'wgEnableAutoRotation', null );
|
|
$this->setMwGlobals( 'wgUseImageMagick', true );
|
|
$this->setMwGlobals( 'wgUseImageResize', true );
|
|
|
|
$file = $this->dataFile( $name, $type );
|
|
$this->assertEquals( $info['width'], $file->getWidth(), "$name: width check" );
|
|
$this->assertEquals( $info['height'], $file->getHeight(), "$name: height check" );
|
|
}
|
|
|
|
/**
|
|
*
|
|
* @dataProvider provideFiles
|
|
*/
|
|
public function testRotationRendering( $name, $type, $info, $thumbs ) {
|
|
if ( !$this->handler->canRotate() ) {
|
|
$this->markTestSkipped( "This test needs a rasterizer that can auto-rotate." );
|
|
}
|
|
foreach ( $thumbs as $size => $out ) {
|
|
if ( preg_match( '/^(\d+)px$/', $size, $matches ) ) {
|
|
$params = array(
|
|
'width' => $matches[1],
|
|
);
|
|
} elseif ( preg_match( '/^(\d+)x(\d+)px$/', $size, $matches ) ) {
|
|
$params = array(
|
|
'width' => $matches[1],
|
|
'height' => $matches[2]
|
|
);
|
|
} else {
|
|
throw new MWException( 'bogus test data format ' . $size );
|
|
}
|
|
|
|
$file = $this->dataFile( $name, $type );
|
|
$thumb = $file->transform( $params, File::RENDER_NOW | File::RENDER_FORCE );
|
|
|
|
$this->assertEquals(
|
|
$out[0],
|
|
$thumb->getWidth(),
|
|
"$name: thumb reported width check for $size"
|
|
);
|
|
$this->assertEquals(
|
|
$out[1],
|
|
$thumb->getHeight(),
|
|
"$name: thumb reported height check for $size"
|
|
);
|
|
|
|
$gis = getimagesize( $thumb->getLocalCopyPath() );
|
|
if ( $out[0] > $info['width'] ) {
|
|
// Physical image won't be scaled bigger than the original.
|
|
$this->assertEquals( $info['width'], $gis[0], "$name: thumb actual width check for $size" );
|
|
$this->assertEquals( $info['height'], $gis[1], "$name: thumb actual height check for $size" );
|
|
} else {
|
|
$this->assertEquals( $out[0], $gis[0], "$name: thumb actual width check for $size" );
|
|
$this->assertEquals( $out[1], $gis[1], "$name: thumb actual height check for $size" );
|
|
}
|
|
}
|
|
}
|
|
|
|
public static function provideFiles() {
|
|
return array(
|
|
array(
|
|
'landscape-plain.jpg',
|
|
'image/jpeg',
|
|
array(
|
|
'width' => 1024,
|
|
'height' => 768,
|
|
),
|
|
array(
|
|
'800x600px' => array( 800, 600 ),
|
|
'9999x800px' => array( 1067, 800 ),
|
|
'800px' => array( 800, 600 ),
|
|
'600px' => array( 600, 450 ),
|
|
)
|
|
),
|
|
array(
|
|
'portrait-rotated.jpg',
|
|
'image/jpeg',
|
|
array(
|
|
'width' => 768, // as rotated
|
|
'height' => 1024, // as rotated
|
|
),
|
|
array(
|
|
'800x600px' => array( 450, 600 ),
|
|
'9999x800px' => array( 600, 800 ),
|
|
'800px' => array( 800, 1067 ),
|
|
'600px' => array( 600, 800 ),
|
|
)
|
|
)
|
|
);
|
|
}
|
|
|
|
/**
|
|
* Same as before, but with auto-rotation disabled.
|
|
* @dataProvider provideFilesNoAutoRotate
|
|
*/
|
|
public function testMetadataNoAutoRotate( $name, $type, $info ) {
|
|
$this->setMwGlobals( 'wgEnableAutoRotation', false );
|
|
|
|
$file = $this->dataFile( $name, $type );
|
|
$this->assertEquals( $info['width'], $file->getWidth(), "$name: width check" );
|
|
$this->assertEquals( $info['height'], $file->getHeight(), "$name: height check" );
|
|
}
|
|
|
|
/**
|
|
* Same as before, but with auto-rotation set to auto and an image scaler that doesn't support it.
|
|
* @dataProvider provideFilesNoAutoRotate
|
|
*/
|
|
public function testMetadataAutoRotateUnsupported( $name, $type, $info ) {
|
|
$this->setMwGlobals( 'wgEnableAutoRotation', null );
|
|
$this->setMwGlobals( 'wgUseImageResize', false );
|
|
|
|
$file = $this->dataFile( $name, $type );
|
|
$this->assertEquals( $info['width'], $file->getWidth(), "$name: width check" );
|
|
$this->assertEquals( $info['height'], $file->getHeight(), "$name: height check" );
|
|
}
|
|
|
|
/**
|
|
*
|
|
* @dataProvider provideFilesNoAutoRotate
|
|
*/
|
|
public function testRotationRenderingNoAutoRotate( $name, $type, $info, $thumbs ) {
|
|
$this->setMwGlobals( 'wgEnableAutoRotation', false );
|
|
|
|
foreach ( $thumbs as $size => $out ) {
|
|
if ( preg_match( '/^(\d+)px$/', $size, $matches ) ) {
|
|
$params = array(
|
|
'width' => $matches[1],
|
|
);
|
|
} elseif ( preg_match( '/^(\d+)x(\d+)px$/', $size, $matches ) ) {
|
|
$params = array(
|
|
'width' => $matches[1],
|
|
'height' => $matches[2]
|
|
);
|
|
} else {
|
|
throw new MWException( 'bogus test data format ' . $size );
|
|
}
|
|
|
|
$file = $this->dataFile( $name, $type );
|
|
$thumb = $file->transform( $params, File::RENDER_NOW | File::RENDER_FORCE );
|
|
|
|
$this->assertEquals(
|
|
$out[0],
|
|
$thumb->getWidth(),
|
|
"$name: thumb reported width check for $size"
|
|
);
|
|
$this->assertEquals(
|
|
$out[1],
|
|
$thumb->getHeight(),
|
|
"$name: thumb reported height check for $size"
|
|
);
|
|
|
|
$gis = getimagesize( $thumb->getLocalCopyPath() );
|
|
if ( $out[0] > $info['width'] ) {
|
|
// Physical image won't be scaled bigger than the original.
|
|
$this->assertEquals( $info['width'], $gis[0], "$name: thumb actual width check for $size" );
|
|
$this->assertEquals( $info['height'], $gis[1], "$name: thumb actual height check for $size" );
|
|
} else {
|
|
$this->assertEquals( $out[0], $gis[0], "$name: thumb actual width check for $size" );
|
|
$this->assertEquals( $out[1], $gis[1], "$name: thumb actual height check for $size" );
|
|
}
|
|
}
|
|
}
|
|
|
|
public static function provideFilesNoAutoRotate() {
|
|
return array(
|
|
array(
|
|
'landscape-plain.jpg',
|
|
'image/jpeg',
|
|
array(
|
|
'width' => 1024,
|
|
'height' => 768,
|
|
),
|
|
array(
|
|
'800x600px' => array( 800, 600 ),
|
|
'9999x800px' => array( 1067, 800 ),
|
|
'800px' => array( 800, 600 ),
|
|
'600px' => array( 600, 450 ),
|
|
)
|
|
),
|
|
array(
|
|
'portrait-rotated.jpg',
|
|
'image/jpeg',
|
|
array(
|
|
'width' => 1024, // since not rotated
|
|
'height' => 768, // since not rotated
|
|
),
|
|
array(
|
|
'800x600px' => array( 800, 600 ),
|
|
'9999x800px' => array( 1067, 800 ),
|
|
'800px' => array( 800, 600 ),
|
|
'600px' => array( 600, 450 ),
|
|
)
|
|
)
|
|
);
|
|
}
|
|
|
|
const TEST_WIDTH = 100;
|
|
const TEST_HEIGHT = 200;
|
|
|
|
/**
|
|
* @dataProvider provideBitmapExtractPreRotationDimensions
|
|
*/
|
|
public function testBitmapExtractPreRotationDimensions( $rotation, $expected ) {
|
|
$result = $this->handler->extractPreRotationDimensions( array(
|
|
'physicalWidth' => self::TEST_WIDTH,
|
|
'physicalHeight' => self::TEST_HEIGHT,
|
|
), $rotation );
|
|
$this->assertEquals( $expected, $result );
|
|
}
|
|
|
|
public static function provideBitmapExtractPreRotationDimensions() {
|
|
return array(
|
|
array(
|
|
0,
|
|
array( self::TEST_WIDTH, self::TEST_HEIGHT )
|
|
),
|
|
array(
|
|
90,
|
|
array( self::TEST_HEIGHT, self::TEST_WIDTH )
|
|
),
|
|
array(
|
|
180,
|
|
array( self::TEST_WIDTH, self::TEST_HEIGHT )
|
|
),
|
|
array(
|
|
270,
|
|
array( self::TEST_HEIGHT, self::TEST_WIDTH )
|
|
),
|
|
);
|
|
}
|
|
}
|