|
|
|
@ -16,31 +16,35 @@ You should have received a copy of the GNU Affero General Public License
|
|
|
|
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
*/
|
|
|
|
*/
|
|
|
|
package gplx.xowa.mws.media; import gplx.*; import gplx.xowa.*; import gplx.xowa.mws.*;
|
|
|
|
package gplx.xowa.mws.media; import gplx.*; import gplx.xowa.*; import gplx.xowa.mws.*;
|
|
|
|
public class Xomw_TransformationalImageHandler {
|
|
|
|
import gplx.xowa.mws.filerepo.file.*;
|
|
|
|
|
|
|
|
import gplx.xowa.mws.parsers.lnkis.*;
|
|
|
|
|
|
|
|
public class Xomw_TransformationalImageHandler extends Xomw_ImageHandler { public Xomw_TransformationalImageHandler(byte[] key) {super(key);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// /**
|
|
|
|
// /**
|
|
|
|
// * @param File $image
|
|
|
|
// * @param File image
|
|
|
|
// * @param array $params Transform parameters. Entries with the keys 'width'
|
|
|
|
// * @param array paramsVar Transform parameters. Entries with the keys 'width'
|
|
|
|
// * and 'height' are the respective screen width and height, while the keys
|
|
|
|
// * and 'height' are the respective screen width and height, while the keys
|
|
|
|
// * 'physicalWidth' and 'physicalHeight' indicate the thumbnail dimensions.
|
|
|
|
// * 'physicalWidth' and 'physicalHeight' indicate the thumbnail dimensions.
|
|
|
|
// * @return boolean
|
|
|
|
// * @return boolean
|
|
|
|
// */
|
|
|
|
// */
|
|
|
|
// function normaliseParams( $image, &$params ) {
|
|
|
|
// function normaliseParams(image, ¶msVar) {
|
|
|
|
// if ( !parent::normaliseParams( $image, $params ) ) {
|
|
|
|
// if (!parent::normaliseParams(image, paramsVar)) {
|
|
|
|
// return false;
|
|
|
|
// return false;
|
|
|
|
// }
|
|
|
|
// }
|
|
|
|
//
|
|
|
|
//
|
|
|
|
// # Obtain the source, pre-rotation dimensions
|
|
|
|
// // Obtain the source, pre-rotation dimensions
|
|
|
|
// $srcWidth = $image->getWidth( $params['page'] );
|
|
|
|
// srcWidth = image.getWidth(paramsVar['page']);
|
|
|
|
// $srcHeight = $image->getHeight( $params['page'] );
|
|
|
|
// srcHeight = image.getHeight(paramsVar['page']);
|
|
|
|
//
|
|
|
|
//
|
|
|
|
// # Don't make an image bigger than the source
|
|
|
|
// // Don't make an image bigger than the source
|
|
|
|
// if ( $params['physicalWidth'] >= $srcWidth ) {
|
|
|
|
// if (paramsVar['physicalWidth'] >= srcWidth) {
|
|
|
|
// $params['physicalWidth'] = $srcWidth;
|
|
|
|
// paramsVar['physicalWidth'] = srcWidth;
|
|
|
|
// $params['physicalHeight'] = $srcHeight;
|
|
|
|
// paramsVar['physicalHeight'] = srcHeight;
|
|
|
|
//
|
|
|
|
//
|
|
|
|
// # Skip scaling limit checks if no scaling is required
|
|
|
|
// // Skip scaling limit checks if no scaling is required
|
|
|
|
// # due to requested size being bigger than source.
|
|
|
|
// // due to requested size being bigger than source.
|
|
|
|
// if ( !$image->mustRender() ) {
|
|
|
|
// if (!image.mustRender()) {
|
|
|
|
// return true;
|
|
|
|
// return true;
|
|
|
|
// }
|
|
|
|
// }
|
|
|
|
// }
|
|
|
|
// }
|
|
|
|
@ -56,228 +60,230 @@ public class Xomw_TransformationalImageHandler {
|
|
|
|
// * stored as raw landscape with 90-degress rotation, the resulting size
|
|
|
|
// * stored as raw landscape with 90-degress rotation, the resulting size
|
|
|
|
// * will be wider than it is tall.
|
|
|
|
// * will be wider than it is tall.
|
|
|
|
// *
|
|
|
|
// *
|
|
|
|
// * @param array $params Parameters as returned by normaliseParams
|
|
|
|
// * @param array paramsVar Parameters as returned by normaliseParams
|
|
|
|
// * @param int $rotation The rotation angle that will be applied
|
|
|
|
// * @param int rotation The rotation angle that will be applied
|
|
|
|
// * @return array ($width, $height) array
|
|
|
|
// * @return array (width, height) array
|
|
|
|
// */
|
|
|
|
// */
|
|
|
|
// public function extractPreRotationDimensions( $params, $rotation ) {
|
|
|
|
// public function extractPreRotationDimensions(paramsVar, rotation) {
|
|
|
|
// if ( $rotation == 90 || $rotation == 270 ) {
|
|
|
|
// if (rotation == 90 || rotation == 270) {
|
|
|
|
// # We'll resize before rotation, so swap the dimensions again
|
|
|
|
// // We'll resize before rotation, so swap the dimensions again
|
|
|
|
// $width = $params['physicalHeight'];
|
|
|
|
// width = paramsVar['physicalHeight'];
|
|
|
|
// $height = $params['physicalWidth'];
|
|
|
|
// height = paramsVar['physicalWidth'];
|
|
|
|
// } else {
|
|
|
|
// } else {
|
|
|
|
// $width = $params['physicalWidth'];
|
|
|
|
// width = paramsVar['physicalWidth'];
|
|
|
|
// $height = $params['physicalHeight'];
|
|
|
|
// height = paramsVar['physicalHeight'];
|
|
|
|
// }
|
|
|
|
// }
|
|
|
|
//
|
|
|
|
//
|
|
|
|
// return [ $width, $height ];
|
|
|
|
// return [ width, height ];
|
|
|
|
// }
|
|
|
|
// }
|
|
|
|
//
|
|
|
|
//
|
|
|
|
// /**
|
|
|
|
/**
|
|
|
|
// * Create a thumbnail.
|
|
|
|
* Create a thumbnail.
|
|
|
|
// *
|
|
|
|
*
|
|
|
|
// * This sets up various parameters, and then calls a helper method
|
|
|
|
* This sets up various parameters, and then calls a helper method
|
|
|
|
// * based on $this->getScalerType in order to scale the image.
|
|
|
|
* based on this.getScalerType in order to scale the image.
|
|
|
|
// *
|
|
|
|
*
|
|
|
|
// * @param File $image
|
|
|
|
* @param File image
|
|
|
|
// * @param String $dstPath
|
|
|
|
* @param String dstPath
|
|
|
|
// * @param String $dstUrl
|
|
|
|
* @param String dstUrl
|
|
|
|
// * @param array $params
|
|
|
|
* @param array paramsVar
|
|
|
|
// * @param int $flags
|
|
|
|
* @param int flags
|
|
|
|
// * @return MediaTransformError|ThumbnailImage|TransformParameterError
|
|
|
|
* @return MediaTransformError|ThumbnailImage|TransformParameterError
|
|
|
|
// */
|
|
|
|
*/
|
|
|
|
// function doTransform( $image, $dstPath, $dstUrl, $params, $flags = 0 ) {
|
|
|
|
@Override public Xomw_MediaTransformOutput doTransform(Xomw_File image, byte[] dstPath, byte[] dstUrl, Xomw_params_handler handlerParams, int flags) {
|
|
|
|
// if ( !$this->normaliseParams( $image, $params ) ) {
|
|
|
|
// if (!this.normaliseParams(image, paramsVar)) {
|
|
|
|
// return new TransformParameterError( $params );
|
|
|
|
// return new TransformParameterError(paramsVar);
|
|
|
|
// }
|
|
|
|
// }
|
|
|
|
//
|
|
|
|
//
|
|
|
|
// # Create a parameter array to pass to the scaler
|
|
|
|
// // Create a parameter array to pass to the scaler
|
|
|
|
// $scalerParams = [
|
|
|
|
// scalerParams = [
|
|
|
|
// # The size to which the image will be resized
|
|
|
|
// // The size to which the image will be resized
|
|
|
|
// 'physicalWidth' => $params['physicalWidth'],
|
|
|
|
// 'physicalWidth' => paramsVar['physicalWidth'],
|
|
|
|
// 'physicalHeight' => $params['physicalHeight'],
|
|
|
|
// 'physicalHeight' => paramsVar['physicalHeight'],
|
|
|
|
// 'physicalDimensions' => "{$params['physicalWidth']}x{$params['physicalHeight']}",
|
|
|
|
// 'physicalDimensions' => "{paramsVar['physicalWidth']}x{paramsVar['physicalHeight']}",
|
|
|
|
// # The size of the image on the page
|
|
|
|
// // The size of the image on the page
|
|
|
|
// 'clientWidth' => $params['width'],
|
|
|
|
// 'clientWidth' => paramsVar['width'],
|
|
|
|
// 'clientHeight' => $params['height'],
|
|
|
|
// 'clientHeight' => paramsVar['height'],
|
|
|
|
// # Comment as will be added to the Exif of the thumbnail
|
|
|
|
// // Comment as will be added to the Exif of the thumbnail
|
|
|
|
// 'comment' => isset( $params['descriptionUrl'] )
|
|
|
|
// 'comment' => isset(paramsVar['descriptionUrl'])
|
|
|
|
// ? "File source: {$params['descriptionUrl']}"
|
|
|
|
// ? "File source: {paramsVar['descriptionUrl']}"
|
|
|
|
// : '',
|
|
|
|
// : '',
|
|
|
|
// # Properties of the original image
|
|
|
|
// // Properties of the original image
|
|
|
|
// 'srcWidth' => $image->getWidth(),
|
|
|
|
// 'srcWidth' => image.getWidth(),
|
|
|
|
// 'srcHeight' => $image->getHeight(),
|
|
|
|
// 'srcHeight' => image.getHeight(),
|
|
|
|
// 'mimeType' => $image->getMimeType(),
|
|
|
|
// 'mimeType' => image.getMimeType(),
|
|
|
|
// 'dstPath' => $dstPath,
|
|
|
|
// 'dstPath' => dstPath,
|
|
|
|
// 'dstUrl' => $dstUrl,
|
|
|
|
// 'dstUrl' => dstUrl,
|
|
|
|
// 'interlace' => isset( $params['interlace'] ) ? $params['interlace'] : false,
|
|
|
|
// 'interlace' => isset(paramsVar['interlace']) ? paramsVar['interlace'] : false,
|
|
|
|
// ];
|
|
|
|
// ];
|
|
|
|
//
|
|
|
|
//
|
|
|
|
// if ( isset( $params['quality'] ) && $params['quality'] === 'low' ) {
|
|
|
|
// if (isset(paramsVar['quality']) && paramsVar['quality'] === 'low') {
|
|
|
|
// $scalerParams['quality'] = 30;
|
|
|
|
// scalerParams['quality'] = 30;
|
|
|
|
// }
|
|
|
|
// }
|
|
|
|
//
|
|
|
|
//
|
|
|
|
// // For subclasses that might be paged.
|
|
|
|
// // For subclasses that might be paged.
|
|
|
|
// if ( $image->isMultipage() && isset( $params['page'] ) ) {
|
|
|
|
// if (image.isMultipage() && isset(paramsVar['page'])) {
|
|
|
|
// $scalerParams['page'] = intval( $params['page'] );
|
|
|
|
// scalerParams['page'] = intval(paramsVar['page']);
|
|
|
|
// }
|
|
|
|
// }
|
|
|
|
//
|
|
|
|
//
|
|
|
|
// # Determine scaler type
|
|
|
|
// // Determine scaler type
|
|
|
|
// $scaler = $this->getScalerType( $dstPath );
|
|
|
|
// scaler = this.getScalerType(dstPath);
|
|
|
|
//
|
|
|
|
//
|
|
|
|
// if ( is_array( $scaler ) ) {
|
|
|
|
// if (is_array(scaler)) {
|
|
|
|
// $scalerName = get_class( $scaler[0] );
|
|
|
|
// scalerName = get_class(scaler[0]);
|
|
|
|
// } else {
|
|
|
|
// } else {
|
|
|
|
// $scalerName = $scaler;
|
|
|
|
// scalerName = scaler;
|
|
|
|
// }
|
|
|
|
// }
|
|
|
|
//
|
|
|
|
//
|
|
|
|
// wfDebug( __METHOD__ . ": creating {$scalerParams['physicalDimensions']} " .
|
|
|
|
// wfDebug(__METHOD__ . ": creating {scalerParams['physicalDimensions']} " .
|
|
|
|
// "thumbnail at $dstPath using scaler $scalerName\n" );
|
|
|
|
// "thumbnail at dstPath using scaler scalerName\n");
|
|
|
|
//
|
|
|
|
//
|
|
|
|
// if ( !$image->mustRender() &&
|
|
|
|
// if (!image.mustRender() &&
|
|
|
|
// $scalerParams['physicalWidth'] == $scalerParams['srcWidth']
|
|
|
|
// scalerParams['physicalWidth'] == scalerParams['srcWidth']
|
|
|
|
// && $scalerParams['physicalHeight'] == $scalerParams['srcHeight']
|
|
|
|
// && scalerParams['physicalHeight'] == scalerParams['srcHeight']
|
|
|
|
// && !isset( $scalerParams['quality'] )
|
|
|
|
// && !isset(scalerParams['quality'])
|
|
|
|
// ) {
|
|
|
|
// ) {
|
|
|
|
//
|
|
|
|
//
|
|
|
|
// # normaliseParams (or the user) wants us to return the unscaled image
|
|
|
|
// // normaliseParams (or the user) wants us to return the unscaled image
|
|
|
|
// wfDebug(__METHOD__ . ": returning unscaled image\n");
|
|
|
|
// wfDebug(__METHOD__ . ": returning unscaled image\n");
|
|
|
|
//
|
|
|
|
//
|
|
|
|
// return $this->getClientScalingThumbnailImage( $image, $scalerParams );
|
|
|
|
// return this.getClientScalingThumbnailImage(image, scalerParams);
|
|
|
|
// }
|
|
|
|
// }
|
|
|
|
//
|
|
|
|
//
|
|
|
|
// if ( $scaler == 'client' ) {
|
|
|
|
// if (scaler == 'client') {
|
|
|
|
// # Client-side image scaling, use the source URL
|
|
|
|
// // Client-side image scaling, use the source URL
|
|
|
|
// # Using the destination URL in a TRANSFORM_LATER request would be incorrect
|
|
|
|
// // Using the destination URL in a TRANSFORM_LATER request would be incorrect
|
|
|
|
// return $this->getClientScalingThumbnailImage( $image, $scalerParams );
|
|
|
|
// return this.getClientScalingThumbnailImage(image, scalerParams);
|
|
|
|
// }
|
|
|
|
// }
|
|
|
|
//
|
|
|
|
//
|
|
|
|
// if ( $image->isTransformedLocally() && !$this->isImageAreaOkForThumbnaling( $image, $params ) ) {
|
|
|
|
// if (image.isTransformedLocally() && !this.isImageAreaOkForThumbnaling(image, paramsVar)) {
|
|
|
|
// global $wgMaxImageArea;
|
|
|
|
// global wgMaxImageArea;
|
|
|
|
// return new TransformTooBigImageAreaError( $params, $wgMaxImageArea );
|
|
|
|
// return new TransformTooBigImageAreaError(paramsVar, wgMaxImageArea);
|
|
|
|
// }
|
|
|
|
// }
|
|
|
|
//
|
|
|
|
//
|
|
|
|
// if ( $flags & self::TRANSFORM_LATER ) {
|
|
|
|
// if (flags & self::TRANSFORM_LATER) {
|
|
|
|
// wfDebug(__METHOD__ . ": Transforming later per flags.\n");
|
|
|
|
// wfDebug(__METHOD__ . ": Transforming later per flags.\n");
|
|
|
|
// $newParams = [
|
|
|
|
// newParams = [
|
|
|
|
// 'width' => $scalerParams['clientWidth'],
|
|
|
|
// 'width' => scalerParams['clientWidth'],
|
|
|
|
// 'height' => $scalerParams['clientHeight']
|
|
|
|
// 'height' => scalerParams['clientHeight']
|
|
|
|
// ];
|
|
|
|
// ];
|
|
|
|
// if ( isset( $params['quality'] ) ) {
|
|
|
|
// if (isset(paramsVar['quality'])) {
|
|
|
|
// $newParams['quality'] = $params['quality'];
|
|
|
|
// newParams['quality'] = paramsVar['quality'];
|
|
|
|
// }
|
|
|
|
// }
|
|
|
|
// if ( isset( $params['page'] ) && $params['page'] ) {
|
|
|
|
// if (isset(paramsVar['page']) && paramsVar['page']) {
|
|
|
|
// $newParams['page'] = $params['page'];
|
|
|
|
// newParams['page'] = paramsVar['page'];
|
|
|
|
// }
|
|
|
|
// }
|
|
|
|
// return new Xomw_ThumbnailImage( $image, $dstUrl, false, $newParams );
|
|
|
|
// return new Xomw_ThumbnailImage(image, dstUrl, null, newParams);
|
|
|
|
|
|
|
|
return new Xomw_ThumbnailImage(image, dstUrl, null, handlerParams);
|
|
|
|
// }
|
|
|
|
// }
|
|
|
|
//
|
|
|
|
//
|
|
|
|
// # Try to make a target path for the thumbnail
|
|
|
|
// // Try to make a target path for the thumbnail
|
|
|
|
// if ( !wfMkdirParents( dirname( $dstPath ), null, __METHOD__ ) ) {
|
|
|
|
// if (!wfMkdirParents(dirname(dstPath), null, __METHOD__)) {
|
|
|
|
// wfDebug(__METHOD__ . ": Unable to create thumbnail destination " .
|
|
|
|
// wfDebug(__METHOD__ . ": Unable to create thumbnail destination " .
|
|
|
|
// "directory, falling back to client scaling\n");
|
|
|
|
// "directory, falling back to client scaling\n");
|
|
|
|
//
|
|
|
|
//
|
|
|
|
// return $this->getClientScalingThumbnailImage( $image, $scalerParams );
|
|
|
|
// return this.getClientScalingThumbnailImage(image, scalerParams);
|
|
|
|
// }
|
|
|
|
// }
|
|
|
|
//
|
|
|
|
//
|
|
|
|
// # Transform functions and binaries need a FS source file
|
|
|
|
// // Transform functions and binaries need a FS source file
|
|
|
|
// $thumbnailSource = $this->getThumbnailSource( $image, $params );
|
|
|
|
// thumbnailSource = this.getThumbnailSource(image, paramsVar);
|
|
|
|
//
|
|
|
|
//
|
|
|
|
// // If the source isn't the original, disable EXIF rotation because it's already been applied
|
|
|
|
// // If the source isn't the original, disable EXIF rotation because it's already been applied
|
|
|
|
// if ( $scalerParams['srcWidth'] != $thumbnailSource['width']
|
|
|
|
// if (scalerParams['srcWidth'] != thumbnailSource['width']
|
|
|
|
// || $scalerParams['srcHeight'] != $thumbnailSource['height'] ) {
|
|
|
|
// || scalerParams['srcHeight'] != thumbnailSource['height']) {
|
|
|
|
// $scalerParams['disableRotation'] = true;
|
|
|
|
// scalerParams['disableRotation'] = true;
|
|
|
|
// }
|
|
|
|
// }
|
|
|
|
//
|
|
|
|
//
|
|
|
|
// $scalerParams['srcPath'] = $thumbnailSource['path'];
|
|
|
|
// scalerParams['srcPath'] = thumbnailSource['path'];
|
|
|
|
// $scalerParams['srcWidth'] = $thumbnailSource['width'];
|
|
|
|
// scalerParams['srcWidth'] = thumbnailSource['width'];
|
|
|
|
// $scalerParams['srcHeight'] = $thumbnailSource['height'];
|
|
|
|
// scalerParams['srcHeight'] = thumbnailSource['height'];
|
|
|
|
//
|
|
|
|
//
|
|
|
|
// if ( $scalerParams['srcPath'] === false ) { // Failed to get local copy
|
|
|
|
// if (scalerParams['srcPath'] === false) { // Failed to get local copy
|
|
|
|
// wfDebugLog('thumbnail',
|
|
|
|
// wfDebugLog('thumbnail',
|
|
|
|
// sprintf('Thumbnail failed on %s: could not get local copy of "%s"',
|
|
|
|
// sprintf('Thumbnail failed on %s: could not get local copy of "%s"',
|
|
|
|
// wfHostname(), $image->getName() ) );
|
|
|
|
// wfHostname(), image.getName()));
|
|
|
|
//
|
|
|
|
//
|
|
|
|
// return new MediaTransformError('thumbnail_error',
|
|
|
|
// return new MediaTransformError('thumbnail_error',
|
|
|
|
// $scalerParams['clientWidth'], $scalerParams['clientHeight'],
|
|
|
|
// scalerParams['clientWidth'], scalerParams['clientHeight'],
|
|
|
|
// wfMessage('filemissing')
|
|
|
|
// wfMessage('filemissing')
|
|
|
|
// );
|
|
|
|
// );
|
|
|
|
// }
|
|
|
|
// }
|
|
|
|
//
|
|
|
|
//
|
|
|
|
// # Try a hook. Called "Bitmap" for historical reasons.
|
|
|
|
// // Try a hook. Called "Bitmap" for historical reasons.
|
|
|
|
// /** @var $mto MediaTransformOutput */
|
|
|
|
// /** @var mto MediaTransformOutput */
|
|
|
|
// $mto = null;
|
|
|
|
// mto = null;
|
|
|
|
// Hooks::run( 'BitmapHandlerTransform', [ $this, $image, &$scalerParams, &$mto ] );
|
|
|
|
// Hooks::run('BitmapHandlerTransform', [ this, image, &scalerParams, &mto ]);
|
|
|
|
// if ( !is_null( $mto ) ) {
|
|
|
|
// if (!is_null(mto)) {
|
|
|
|
// wfDebug(__METHOD__ . ": Hook to BitmapHandlerTransform created an mto\n");
|
|
|
|
// wfDebug(__METHOD__ . ": Hook to BitmapHandlerTransform created an mto\n");
|
|
|
|
// $scaler = 'hookaborted';
|
|
|
|
// scaler = 'hookaborted';
|
|
|
|
// }
|
|
|
|
// }
|
|
|
|
//
|
|
|
|
//
|
|
|
|
// // $scaler will return a MediaTransformError on failure, or false on success.
|
|
|
|
// // scaler will return a MediaTransformError on failure, or false on success.
|
|
|
|
// // If the scaler is succesful, it will have created a thumbnail at the destination
|
|
|
|
// // If the scaler is succesful, it will have created a thumbnail at the destination
|
|
|
|
// // path.
|
|
|
|
// // path.
|
|
|
|
// if ( is_array( $scaler ) && is_callable( $scaler ) ) {
|
|
|
|
// if (is_array(scaler) && is_callable(scaler)) {
|
|
|
|
// // Allow subclasses to specify their own rendering methods.
|
|
|
|
// // Allow subclasses to specify their own rendering methods.
|
|
|
|
// $err = call_user_func( $scaler, $image, $scalerParams );
|
|
|
|
// err = call_user_func(scaler, image, scalerParams);
|
|
|
|
// } else {
|
|
|
|
// } else {
|
|
|
|
// switch ( $scaler ) {
|
|
|
|
// switch (scaler) {
|
|
|
|
// case 'hookaborted':
|
|
|
|
// case 'hookaborted':
|
|
|
|
// # Handled by the hook above
|
|
|
|
// // Handled by the hook above
|
|
|
|
// $err = $mto->isError() ? $mto : false;
|
|
|
|
// err = mto.isError() ? mto : false;
|
|
|
|
// break;
|
|
|
|
// break;
|
|
|
|
// case 'im':
|
|
|
|
// case 'im':
|
|
|
|
// $err = $this->transformImageMagick( $image, $scalerParams );
|
|
|
|
// err = this.transformImageMagick(image, scalerParams);
|
|
|
|
// break;
|
|
|
|
// break;
|
|
|
|
// case 'custom':
|
|
|
|
// case 'custom':
|
|
|
|
// $err = $this->transformCustom( $image, $scalerParams );
|
|
|
|
// err = this.transformCustom(image, scalerParams);
|
|
|
|
// break;
|
|
|
|
// break;
|
|
|
|
// case 'imext':
|
|
|
|
// case 'imext':
|
|
|
|
// $err = $this->transformImageMagickExt( $image, $scalerParams );
|
|
|
|
// err = this.transformImageMagickExt(image, scalerParams);
|
|
|
|
// break;
|
|
|
|
// break;
|
|
|
|
// case 'gd':
|
|
|
|
// case 'gd':
|
|
|
|
// default:
|
|
|
|
// default:
|
|
|
|
// $err = $this->transformGd( $image, $scalerParams );
|
|
|
|
// err = this.transformGd(image, scalerParams);
|
|
|
|
// break;
|
|
|
|
// break;
|
|
|
|
// }
|
|
|
|
// }
|
|
|
|
// }
|
|
|
|
// }
|
|
|
|
//
|
|
|
|
//
|
|
|
|
// # Remove the file if a zero-byte thumbnail was created, or if there was an error
|
|
|
|
// // Remove the file if a zero-byte thumbnail was created, or if there was an error
|
|
|
|
// $removed = $this->removeBadFile( $dstPath, (boolean)$err );
|
|
|
|
// removed = this.removeBadFile(dstPath, (boolean)err);
|
|
|
|
// if ( $err ) {
|
|
|
|
// if (err) {
|
|
|
|
// # transform returned MediaTransforError
|
|
|
|
// // transform returned MediaTransforError
|
|
|
|
// return $err;
|
|
|
|
// return err;
|
|
|
|
// } elseif ( $removed ) {
|
|
|
|
// } elseif (removed) {
|
|
|
|
// # Thumbnail was zero-byte and had to be removed
|
|
|
|
// // Thumbnail was zero-byte and had to be removed
|
|
|
|
// return new MediaTransformError('thumbnail_error',
|
|
|
|
// return new MediaTransformError('thumbnail_error',
|
|
|
|
// $scalerParams['clientWidth'], $scalerParams['clientHeight'],
|
|
|
|
// scalerParams['clientWidth'], scalerParams['clientHeight'],
|
|
|
|
// wfMessage('unknown-error')
|
|
|
|
// wfMessage('unknown-error')
|
|
|
|
// );
|
|
|
|
// );
|
|
|
|
// } elseif ( $mto ) {
|
|
|
|
// } elseif (mto) {
|
|
|
|
// return $mto;
|
|
|
|
// return mto;
|
|
|
|
// } else {
|
|
|
|
// } else {
|
|
|
|
// $newParams = [
|
|
|
|
// newParams = [
|
|
|
|
// 'width' => $scalerParams['clientWidth'],
|
|
|
|
// 'width' => scalerParams['clientWidth'],
|
|
|
|
// 'height' => $scalerParams['clientHeight']
|
|
|
|
// 'height' => scalerParams['clientHeight']
|
|
|
|
// ];
|
|
|
|
// ];
|
|
|
|
// if ( isset( $params['quality'] ) ) {
|
|
|
|
// if (isset(paramsVar['quality'])) {
|
|
|
|
// $newParams['quality'] = $params['quality'];
|
|
|
|
// newParams['quality'] = paramsVar['quality'];
|
|
|
|
// }
|
|
|
|
|
|
|
|
// if ( isset( $params['page'] ) && $params['page'] ) {
|
|
|
|
|
|
|
|
// $newParams['page'] = $params['page'];
|
|
|
|
|
|
|
|
// }
|
|
|
|
// }
|
|
|
|
// return new ThumbnailImage( $image, $dstUrl, $dstPath, $newParams );
|
|
|
|
// if (isset(paramsVar['page']) && paramsVar['page']) {
|
|
|
|
|
|
|
|
// newParams['page'] = paramsVar['page'];
|
|
|
|
// }
|
|
|
|
// }
|
|
|
|
|
|
|
|
// return new ThumbnailImage(image, dstUrl, dstPath, newParams);
|
|
|
|
// }
|
|
|
|
// }
|
|
|
|
//
|
|
|
|
// return null;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// /**
|
|
|
|
// /**
|
|
|
|
// * Get the source file for the transform
|
|
|
|
// * Get the source file for the transform
|
|
|
|
// *
|
|
|
|
// *
|
|
|
|
// * @param File $file
|
|
|
|
// * @param File file
|
|
|
|
// * @param array $params
|
|
|
|
// * @param array paramsVar
|
|
|
|
// * @return array Array with keys width, height and path.
|
|
|
|
// * @return array Array with keys width, height and path.
|
|
|
|
// */
|
|
|
|
// */
|
|
|
|
// protected function getThumbnailSource( $file, $params ) {
|
|
|
|
// protected function getThumbnailSource(file, paramsVar) {
|
|
|
|
// return $file->getThumbnailSource( $params );
|
|
|
|
// return file.getThumbnailSource(paramsVar);
|
|
|
|
// }
|
|
|
|
// }
|
|
|
|
//
|
|
|
|
//
|
|
|
|
// /**
|
|
|
|
// /**
|
|
|
|
@ -288,38 +294,38 @@ public class Xomw_TransformationalImageHandler {
|
|
|
|
// *
|
|
|
|
// *
|
|
|
|
// * If specifying a custom scaler command with [ Obj, method ],
|
|
|
|
// * If specifying a custom scaler command with [ Obj, method ],
|
|
|
|
// * the method in question should take 2 parameters, a File Object,
|
|
|
|
// * the method in question should take 2 parameters, a File Object,
|
|
|
|
// * and a $scalerParams array with various options (See doTransform
|
|
|
|
// * and a scalerParams array with various options (See doTransform
|
|
|
|
// * for what is in $scalerParams). On error it should return a
|
|
|
|
// * for what is in scalerParams). On error it should return a
|
|
|
|
// * MediaTransformError Object. On success it should return false,
|
|
|
|
// * MediaTransformError Object. On success it should return false,
|
|
|
|
// * and simply make sure the thumbnail file is located at
|
|
|
|
// * and simply make sure the thumbnail file is located at
|
|
|
|
// * $scalerParams['dstPath'].
|
|
|
|
// * scalerParams['dstPath'].
|
|
|
|
// *
|
|
|
|
// *
|
|
|
|
// * If there is a problem with the output path, it returns "client"
|
|
|
|
// * If there is a problem with the output path, it returns "client"
|
|
|
|
// * to do client side scaling.
|
|
|
|
// * to do client side scaling.
|
|
|
|
// *
|
|
|
|
// *
|
|
|
|
// * @param String $dstPath
|
|
|
|
// * @param String dstPath
|
|
|
|
// * @param boolean $checkDstPath Check that $dstPath is valid
|
|
|
|
// * @param boolean checkDstPath Check that dstPath is valid
|
|
|
|
// * @return String|Callable One of client, im, custom, gd, imext, or a Callable array.
|
|
|
|
// * @return String|Callable One of client, im, custom, gd, imext, or a Callable array.
|
|
|
|
// */
|
|
|
|
// */
|
|
|
|
// abstract protected function getScalerType( $dstPath, $checkDstPath = true );
|
|
|
|
// abstract protected function getScalerType(dstPath, checkDstPath = true);
|
|
|
|
//
|
|
|
|
//
|
|
|
|
// /**
|
|
|
|
// /**
|
|
|
|
// * Get a ThumbnailImage that respresents an image that will be scaled
|
|
|
|
// * Get a ThumbnailImage that respresents an image that will be scaled
|
|
|
|
// * client side
|
|
|
|
// * client side
|
|
|
|
// *
|
|
|
|
// *
|
|
|
|
// * @param File $image File associated with this thumbnail
|
|
|
|
// * @param File image File associated with this thumbnail
|
|
|
|
// * @param array $scalerParams Array with scaler params
|
|
|
|
// * @param array scalerParams Array with scaler paramsVar
|
|
|
|
// * @return ThumbnailImage
|
|
|
|
// * @return ThumbnailImage
|
|
|
|
// *
|
|
|
|
// *
|
|
|
|
// * @todo FIXME: No rotation support
|
|
|
|
// * @todo FIXME: No rotation support
|
|
|
|
// */
|
|
|
|
// */
|
|
|
|
// protected function getClientScalingThumbnailImage( $image, $scalerParams ) {
|
|
|
|
// protected function getClientScalingThumbnailImage(image, scalerParams) {
|
|
|
|
// $params = [
|
|
|
|
// paramsVar = [
|
|
|
|
// 'width' => $scalerParams['clientWidth'],
|
|
|
|
// 'width' => scalerParams['clientWidth'],
|
|
|
|
// 'height' => $scalerParams['clientHeight']
|
|
|
|
// 'height' => scalerParams['clientHeight']
|
|
|
|
// ];
|
|
|
|
// ];
|
|
|
|
//
|
|
|
|
//
|
|
|
|
// return new ThumbnailImage( $image, $image->getUrl(), null, $params );
|
|
|
|
// return new ThumbnailImage(image, image.getUrl(), null, paramsVar);
|
|
|
|
// }
|
|
|
|
// }
|
|
|
|
//
|
|
|
|
//
|
|
|
|
// /**
|
|
|
|
// /**
|
|
|
|
@ -327,13 +333,13 @@ public class Xomw_TransformationalImageHandler {
|
|
|
|
// *
|
|
|
|
// *
|
|
|
|
// * This is a stub method. The real method is in BitmapHander.
|
|
|
|
// * This is a stub method. The real method is in BitmapHander.
|
|
|
|
// *
|
|
|
|
// *
|
|
|
|
// * @param File $image File associated with this thumbnail
|
|
|
|
// * @param File image File associated with this thumbnail
|
|
|
|
// * @param array $params Array with scaler params
|
|
|
|
// * @param array paramsVar Array with scaler paramsVar
|
|
|
|
// *
|
|
|
|
// *
|
|
|
|
// * @return MediaTransformError Error Object if error occurred, false (=no error) otherwise
|
|
|
|
// * @return MediaTransformError Error Object if error occurred, false (=no error) otherwise
|
|
|
|
// */
|
|
|
|
// */
|
|
|
|
// protected function transformImageMagick( $image, $params ) {
|
|
|
|
// protected function transformImageMagick(image, paramsVar) {
|
|
|
|
// return $this->getMediaTransformError( $params, "Unimplemented" );
|
|
|
|
// return this.getMediaTransformError(paramsVar, "Unimplemented");
|
|
|
|
// }
|
|
|
|
// }
|
|
|
|
//
|
|
|
|
//
|
|
|
|
// /**
|
|
|
|
// /**
|
|
|
|
@ -341,13 +347,13 @@ public class Xomw_TransformationalImageHandler {
|
|
|
|
// *
|
|
|
|
// *
|
|
|
|
// * This is a stub method. The real method is in BitmapHander.
|
|
|
|
// * This is a stub method. The real method is in BitmapHander.
|
|
|
|
// *
|
|
|
|
// *
|
|
|
|
// * @param File $image File associated with this thumbnail
|
|
|
|
// * @param File image File associated with this thumbnail
|
|
|
|
// * @param array $params Array with scaler params
|
|
|
|
// * @param array paramsVar Array with scaler paramsVar
|
|
|
|
// *
|
|
|
|
// *
|
|
|
|
// * @return MediaTransformError Error Object if error occurred, false (=no error) otherwise
|
|
|
|
// * @return MediaTransformError Error Object if error occurred, false (=no error) otherwise
|
|
|
|
// */
|
|
|
|
// */
|
|
|
|
// protected function transformImageMagickExt( $image, $params ) {
|
|
|
|
// protected function transformImageMagickExt(image, paramsVar) {
|
|
|
|
// return $this->getMediaTransformError( $params, "Unimplemented" );
|
|
|
|
// return this.getMediaTransformError(paramsVar, "Unimplemented");
|
|
|
|
// }
|
|
|
|
// }
|
|
|
|
//
|
|
|
|
//
|
|
|
|
// /**
|
|
|
|
// /**
|
|
|
|
@ -355,25 +361,25 @@ public class Xomw_TransformationalImageHandler {
|
|
|
|
// *
|
|
|
|
// *
|
|
|
|
// * This is a stub method. The real method is in BitmapHander.
|
|
|
|
// * This is a stub method. The real method is in BitmapHander.
|
|
|
|
// *
|
|
|
|
// *
|
|
|
|
// * @param File $image File associated with this thumbnail
|
|
|
|
// * @param File image File associated with this thumbnail
|
|
|
|
// * @param array $params Array with scaler params
|
|
|
|
// * @param array paramsVar Array with scaler paramsVar
|
|
|
|
// *
|
|
|
|
// *
|
|
|
|
// * @return MediaTransformError Error Object if error occurred, false (=no error) otherwise
|
|
|
|
// * @return MediaTransformError Error Object if error occurred, false (=no error) otherwise
|
|
|
|
// */
|
|
|
|
// */
|
|
|
|
// protected function transformCustom( $image, $params ) {
|
|
|
|
// protected function transformCustom(image, paramsVar) {
|
|
|
|
// return $this->getMediaTransformError( $params, "Unimplemented" );
|
|
|
|
// return this.getMediaTransformError(paramsVar, "Unimplemented");
|
|
|
|
// }
|
|
|
|
// }
|
|
|
|
//
|
|
|
|
//
|
|
|
|
// /**
|
|
|
|
// /**
|
|
|
|
// * Get a MediaTransformError with error 'thumbnail_error'
|
|
|
|
// * Get a MediaTransformError with error 'thumbnail_error'
|
|
|
|
// *
|
|
|
|
// *
|
|
|
|
// * @param array $params Parameter array as passed to the transform* functions
|
|
|
|
// * @param array paramsVar Parameter array as passed to the transform* functions
|
|
|
|
// * @param String $errMsg Error message
|
|
|
|
// * @param String errMsg Error message
|
|
|
|
// * @return MediaTransformError
|
|
|
|
// * @return MediaTransformError
|
|
|
|
// */
|
|
|
|
// */
|
|
|
|
// public function getMediaTransformError( $params, $errMsg ) {
|
|
|
|
// public function getMediaTransformError(paramsVar, errMsg) {
|
|
|
|
// return new MediaTransformError( 'thumbnail_error', $params['clientWidth'],
|
|
|
|
// return new MediaTransformError('thumbnail_error', paramsVar['clientWidth'],
|
|
|
|
// $params['clientHeight'], $errMsg );
|
|
|
|
// paramsVar['clientHeight'], errMsg);
|
|
|
|
// }
|
|
|
|
// }
|
|
|
|
//
|
|
|
|
//
|
|
|
|
// /**
|
|
|
|
// /**
|
|
|
|
@ -381,32 +387,32 @@ public class Xomw_TransformationalImageHandler {
|
|
|
|
// *
|
|
|
|
// *
|
|
|
|
// * This is a stub method. The real method is in BitmapHander.
|
|
|
|
// * This is a stub method. The real method is in BitmapHander.
|
|
|
|
// *
|
|
|
|
// *
|
|
|
|
// * @param File $image File associated with this thumbnail
|
|
|
|
// * @param File image File associated with this thumbnail
|
|
|
|
// * @param array $params Array with scaler params
|
|
|
|
// * @param array paramsVar Array with scaler paramsVar
|
|
|
|
// *
|
|
|
|
// *
|
|
|
|
// * @return MediaTransformError Error Object if error occurred, false (=no error) otherwise
|
|
|
|
// * @return MediaTransformError Error Object if error occurred, false (=no error) otherwise
|
|
|
|
// */
|
|
|
|
// */
|
|
|
|
// protected function transformGd( $image, $params ) {
|
|
|
|
// protected function transformGd(image, paramsVar) {
|
|
|
|
// return $this->getMediaTransformError( $params, "Unimplemented" );
|
|
|
|
// return this.getMediaTransformError(paramsVar, "Unimplemented");
|
|
|
|
// }
|
|
|
|
// }
|
|
|
|
//
|
|
|
|
//
|
|
|
|
// /**
|
|
|
|
// /**
|
|
|
|
// * Escape a String for ImageMagick's property input (e.g. -set -comment)
|
|
|
|
// * Escape a String for ImageMagick's property input (e.g. -set -comment)
|
|
|
|
// * See InterpretImageProperties() in magick/property.c
|
|
|
|
// * See InterpretImageProperties() in magick/property.c
|
|
|
|
// * @param String $s
|
|
|
|
// * @param String s
|
|
|
|
// * @return String
|
|
|
|
// * @return String
|
|
|
|
// */
|
|
|
|
// */
|
|
|
|
// function escapeMagickProperty( $s ) {
|
|
|
|
// function escapeMagickProperty(s) {
|
|
|
|
// // Double the backslashes
|
|
|
|
// // Double the backslashes
|
|
|
|
// $s = str_replace( '\\', '\\\\', $s );
|
|
|
|
// s = str_replace('\\', '\\\\', s);
|
|
|
|
// // Double the percents
|
|
|
|
// // Double the percents
|
|
|
|
// $s = str_replace( '%', '%%', $s );
|
|
|
|
// s = str_replace('%', '%%', s);
|
|
|
|
// // Escape initial - or @
|
|
|
|
// // Escape initial - or @
|
|
|
|
// if ( strlen( $s ) > 0 && ( $s[0] === '-' || $s[0] === '@' ) ) {
|
|
|
|
// if (strlen(s) > 0 && (s[0] === '-' || s[0] === '@')) {
|
|
|
|
// $s = '\\' . $s;
|
|
|
|
// s = '\\' . s;
|
|
|
|
// }
|
|
|
|
// }
|
|
|
|
//
|
|
|
|
//
|
|
|
|
// return $s;
|
|
|
|
// return s;
|
|
|
|
// }
|
|
|
|
// }
|
|
|
|
//
|
|
|
|
//
|
|
|
|
// /**
|
|
|
|
// /**
|
|
|
|
@ -421,51 +427,51 @@ public class Xomw_TransformationalImageHandler {
|
|
|
|
// * in a directory, so we're better off escaping and waiting for the bugfix
|
|
|
|
// * in a directory, so we're better off escaping and waiting for the bugfix
|
|
|
|
// * to filter down to users.
|
|
|
|
// * to filter down to users.
|
|
|
|
// *
|
|
|
|
// *
|
|
|
|
// * @param String $path The file path
|
|
|
|
// * @param String path The file path
|
|
|
|
// * @param boolean|String $scene The scene specification, or false if there is none
|
|
|
|
// * @param boolean|String scene The scene specification, or false if there is none
|
|
|
|
// * @throws MWException
|
|
|
|
// * @throws MWException
|
|
|
|
// * @return String
|
|
|
|
// * @return String
|
|
|
|
// */
|
|
|
|
// */
|
|
|
|
// function escapeMagickInput( $path, $scene = false ) {
|
|
|
|
// function escapeMagickInput(path, scene = false) {
|
|
|
|
// # Die on initial metacharacters (caller should prepend path)
|
|
|
|
// // Die on initial metacharacters (caller should prepend path)
|
|
|
|
// $firstChar = substr( $path, 0, 1 );
|
|
|
|
// firstChar = substr(path, 0, 1);
|
|
|
|
// if ( $firstChar === '~' || $firstChar === '@' ) {
|
|
|
|
// if (firstChar === '~' || firstChar === '@') {
|
|
|
|
// throw new MWException(__METHOD__ . ': cannot escape this path name');
|
|
|
|
// throw new MWException(__METHOD__ . ': cannot escape this path name');
|
|
|
|
// }
|
|
|
|
// }
|
|
|
|
//
|
|
|
|
//
|
|
|
|
// # Escape glob chars
|
|
|
|
// // Escape glob chars
|
|
|
|
// $path = preg_replace( '/[*?\[\]{}]/', '\\\\\0', $path );
|
|
|
|
// path = preg_replace('/[*?\[\]{}]/', '\\\\\0', path);
|
|
|
|
//
|
|
|
|
//
|
|
|
|
// return $this->escapeMagickPath( $path, $scene );
|
|
|
|
// return this.escapeMagickPath(path, scene);
|
|
|
|
// }
|
|
|
|
// }
|
|
|
|
//
|
|
|
|
//
|
|
|
|
// /**
|
|
|
|
// /**
|
|
|
|
// * Escape a String for ImageMagick's output filename. See
|
|
|
|
// * Escape a String for ImageMagick's output filename. See
|
|
|
|
// * InterpretImageFilename() in magick/image.c.
|
|
|
|
// * InterpretImageFilename() in magick/image.c.
|
|
|
|
// * @param String $path The file path
|
|
|
|
// * @param String path The file path
|
|
|
|
// * @param boolean|String $scene The scene specification, or false if there is none
|
|
|
|
// * @param boolean|String scene The scene specification, or false if there is none
|
|
|
|
// * @return String
|
|
|
|
// * @return String
|
|
|
|
// */
|
|
|
|
// */
|
|
|
|
// function escapeMagickOutput( $path, $scene = false ) {
|
|
|
|
// function escapeMagickOutput(path, scene = false) {
|
|
|
|
// $path = str_replace( '%', '%%', $path );
|
|
|
|
// path = str_replace('%', '%%', path);
|
|
|
|
//
|
|
|
|
//
|
|
|
|
// return $this->escapeMagickPath( $path, $scene );
|
|
|
|
// return this.escapeMagickPath(path, scene);
|
|
|
|
// }
|
|
|
|
// }
|
|
|
|
//
|
|
|
|
//
|
|
|
|
// /**
|
|
|
|
// /**
|
|
|
|
// * Armour a String against ImageMagick's GetPathComponent(). This is a
|
|
|
|
// * Armour a String against ImageMagick's GetPathComponent(). This is a
|
|
|
|
// * helper function for escapeMagickInput() and escapeMagickOutput().
|
|
|
|
// * helper function for escapeMagickInput() and escapeMagickOutput().
|
|
|
|
// *
|
|
|
|
// *
|
|
|
|
// * @param String $path The file path
|
|
|
|
// * @param String path The file path
|
|
|
|
// * @param boolean|String $scene The scene specification, or false if there is none
|
|
|
|
// * @param boolean|String scene The scene specification, or false if there is none
|
|
|
|
// * @throws MWException
|
|
|
|
// * @throws MWException
|
|
|
|
// * @return String
|
|
|
|
// * @return String
|
|
|
|
// */
|
|
|
|
// */
|
|
|
|
// protected function escapeMagickPath( $path, $scene = false ) {
|
|
|
|
// protected function escapeMagickPath(path, scene = false) {
|
|
|
|
// # Die on format specifiers (other than drive letters). The regex is
|
|
|
|
// // Die on format specifiers (other than drive letters). The regex is
|
|
|
|
// # meant to match all the formats you get from "convert -list format"
|
|
|
|
// // meant to match all the formats you get from "convert -list format"
|
|
|
|
// if ( preg_match( '/^([a-zA-Z0-9-]+):/', $path, $m ) ) {
|
|
|
|
// if (preg_match('/^([a-zA-Z0-9-]+):/', path, m)) {
|
|
|
|
// if ( wfIsWindows() && is_dir( $m[0] ) ) {
|
|
|
|
// if (wfIsWindows() && is_dir(m[0])) {
|
|
|
|
// // OK, it's a drive letter
|
|
|
|
// // OK, it's a drive letter
|
|
|
|
// // ImageMagick has a similar exception, see IsMagickConflict()
|
|
|
|
// // ImageMagick has a similar exception, see IsMagickConflict()
|
|
|
|
// } else {
|
|
|
|
// } else {
|
|
|
|
@ -473,17 +479,17 @@ public class Xomw_TransformationalImageHandler {
|
|
|
|
// }
|
|
|
|
// }
|
|
|
|
// }
|
|
|
|
// }
|
|
|
|
//
|
|
|
|
//
|
|
|
|
// # If there are square brackets, add a do-nothing scene specification
|
|
|
|
// // If there are square brackets, add a do-nothing scene specification
|
|
|
|
// # to force a literal interpretation
|
|
|
|
// // to force a literal interpretation
|
|
|
|
// if ( $scene === false ) {
|
|
|
|
// if (scene === false) {
|
|
|
|
// if ( strpos( $path, '[' ) !== false ) {
|
|
|
|
// if (strpos(path, '[') !== false) {
|
|
|
|
// $path .= '[0--1]';
|
|
|
|
// path .= '[0--1]';
|
|
|
|
// }
|
|
|
|
// }
|
|
|
|
// } else {
|
|
|
|
// } else {
|
|
|
|
// $path .= "[$scene]";
|
|
|
|
// path .= "[scene]";
|
|
|
|
// }
|
|
|
|
// }
|
|
|
|
//
|
|
|
|
//
|
|
|
|
// return $path;
|
|
|
|
// return path;
|
|
|
|
// }
|
|
|
|
// }
|
|
|
|
//
|
|
|
|
//
|
|
|
|
// /**
|
|
|
|
// /**
|
|
|
|
@ -493,27 +499,27 @@ public class Xomw_TransformationalImageHandler {
|
|
|
|
// * @return String|boolean Representing the IM version; false on error
|
|
|
|
// * @return String|boolean Representing the IM version; false on error
|
|
|
|
// */
|
|
|
|
// */
|
|
|
|
// protected function getMagickVersion() {
|
|
|
|
// protected function getMagickVersion() {
|
|
|
|
// $cache = MediaWikiServices::getInstance()->getLocalServerObjectCache();
|
|
|
|
// cache = MediaWikiServices::getInstance().getLocalServerObjectCache();
|
|
|
|
// $method = __METHOD__;
|
|
|
|
// method = __METHOD__;
|
|
|
|
// return $cache->getWithSetCallback(
|
|
|
|
// return cache.getWithSetCallback(
|
|
|
|
// 'imagemagick-version',
|
|
|
|
// 'imagemagick-version',
|
|
|
|
// $cache::TTL_HOUR,
|
|
|
|
// cache::TTL_HOUR,
|
|
|
|
// function () use ( $method ) {
|
|
|
|
// function () use (method) {
|
|
|
|
// global $wgImageMagickConvertCommand;
|
|
|
|
// global wgImageMagickConvertCommand;
|
|
|
|
//
|
|
|
|
//
|
|
|
|
// $cmd = wfEscapeShellArg( $wgImageMagickConvertCommand ) . ' -version';
|
|
|
|
// cmd = wfEscapeShellArg(wgImageMagickConvertCommand) . ' -version';
|
|
|
|
// wfDebug( $method . ": Running convert -version\n" );
|
|
|
|
// wfDebug(method . ": Running convert -version\n");
|
|
|
|
// $retval = '';
|
|
|
|
// retval = '';
|
|
|
|
// $return = wfShellExec( $cmd, $retval );
|
|
|
|
// return = wfShellExec(cmd, retval);
|
|
|
|
// $x = preg_match(
|
|
|
|
// x = preg_match(
|
|
|
|
// '/Version: ImageMagick ([0-9]*\.[0-9]*\.[0-9]*)/', $return, $matches
|
|
|
|
// '/Version: ImageMagick ([0-9]*\.[0-9]*\.[0-9]*)/', return, matches
|
|
|
|
// );
|
|
|
|
// );
|
|
|
|
// if ( $x != 1 ) {
|
|
|
|
// if (x != 1) {
|
|
|
|
// wfDebug( $method . ": ImageMagick version check failed\n" );
|
|
|
|
// wfDebug(method . ": ImageMagick version check failed\n");
|
|
|
|
// return false;
|
|
|
|
// return false;
|
|
|
|
// }
|
|
|
|
// }
|
|
|
|
//
|
|
|
|
//
|
|
|
|
// return $matches[1];
|
|
|
|
// return matches[1];
|
|
|
|
// }
|
|
|
|
// }
|
|
|
|
// );
|
|
|
|
// );
|
|
|
|
// }
|
|
|
|
// }
|
|
|
|
@ -532,7 +538,7 @@ public class Xomw_TransformationalImageHandler {
|
|
|
|
// * Should we automatically rotate an image based on exif
|
|
|
|
// * Should we automatically rotate an image based on exif
|
|
|
|
// *
|
|
|
|
// *
|
|
|
|
// * @since 1.24 No longer static
|
|
|
|
// * @since 1.24 No longer static
|
|
|
|
// * @see $wgEnableAutoRotation
|
|
|
|
// * @see wgEnableAutoRotation
|
|
|
|
// * @return boolean Whether auto rotation is enabled
|
|
|
|
// * @return boolean Whether auto rotation is enabled
|
|
|
|
// */
|
|
|
|
// */
|
|
|
|
// public function autoRotateEnabled() {
|
|
|
|
// public function autoRotateEnabled() {
|
|
|
|
@ -544,26 +550,26 @@ public class Xomw_TransformationalImageHandler {
|
|
|
|
// *
|
|
|
|
// *
|
|
|
|
// * This is a stub. See BitmapHandler::rotate.
|
|
|
|
// * This is a stub. See BitmapHandler::rotate.
|
|
|
|
// *
|
|
|
|
// *
|
|
|
|
// * @param File $file
|
|
|
|
// * @param File file
|
|
|
|
// * @param array $params Rotate parameters.
|
|
|
|
// * @param array paramsVar Rotate parameters.
|
|
|
|
// * 'rotation' clockwise rotation in degrees, allowed are multiples of 90
|
|
|
|
// * 'rotation' clockwise rotation in degrees, allowed are multiples of 90
|
|
|
|
// * @since 1.24 Is non-static. From 1.21 it was static
|
|
|
|
// * @since 1.24 Is non-static. From 1.21 it was static
|
|
|
|
// * @return boolean|MediaTransformError
|
|
|
|
// * @return boolean|MediaTransformError
|
|
|
|
// */
|
|
|
|
// */
|
|
|
|
// public function rotate( $file, $params ) {
|
|
|
|
// public function rotate(file, paramsVar) {
|
|
|
|
// return new MediaTransformError('thumbnail_error', 0, 0,
|
|
|
|
// return new MediaTransformError('thumbnail_error', 0, 0,
|
|
|
|
// get_class( $this ) . ' rotation not implemented' );
|
|
|
|
// get_class(this) . ' rotation not implemented');
|
|
|
|
// }
|
|
|
|
// }
|
|
|
|
//
|
|
|
|
//
|
|
|
|
// /**
|
|
|
|
// /**
|
|
|
|
// * Returns whether the file needs to be rendered. Returns true if the
|
|
|
|
// * Returns whether the file needs to be rendered. Returns true if the
|
|
|
|
// * file requires rotation and we are able to rotate it.
|
|
|
|
// * file requires rotation and we are able to rotate it.
|
|
|
|
// *
|
|
|
|
// *
|
|
|
|
// * @param File $file
|
|
|
|
// * @param File file
|
|
|
|
// * @return boolean
|
|
|
|
// * @return boolean
|
|
|
|
// */
|
|
|
|
// */
|
|
|
|
// public function mustRender( $file ) {
|
|
|
|
// public function mustRender(file) {
|
|
|
|
// return $this->canRotate() && $this->getRotation( $file ) != 0;
|
|
|
|
// return this.canRotate() && this.getRotation(file) != 0;
|
|
|
|
// }
|
|
|
|
// }
|
|
|
|
//
|
|
|
|
//
|
|
|
|
// /**
|
|
|
|
// /**
|
|
|
|
@ -571,35 +577,35 @@ public class Xomw_TransformationalImageHandler {
|
|
|
|
// *
|
|
|
|
// *
|
|
|
|
// * Runs the 'BitmapHandlerCheckImageArea' hook.
|
|
|
|
// * Runs the 'BitmapHandlerCheckImageArea' hook.
|
|
|
|
// *
|
|
|
|
// *
|
|
|
|
// * @param File $file
|
|
|
|
// * @param File file
|
|
|
|
// * @param array $params
|
|
|
|
// * @param array paramsVar
|
|
|
|
// * @return boolean
|
|
|
|
// * @return boolean
|
|
|
|
// * @since 1.25
|
|
|
|
// * @since 1.25
|
|
|
|
// */
|
|
|
|
// */
|
|
|
|
// public function isImageAreaOkForThumbnaling( $file, &$params ) {
|
|
|
|
// public function isImageAreaOkForThumbnaling(file, ¶msVar) {
|
|
|
|
// global $wgMaxImageArea;
|
|
|
|
// global wgMaxImageArea;
|
|
|
|
//
|
|
|
|
//
|
|
|
|
// # For historical reasons, hook starts with BitmapHandler
|
|
|
|
// // For historical reasons, hook starts with BitmapHandler
|
|
|
|
// $checkImageAreaHookResult = null;
|
|
|
|
// checkImageAreaHookResult = null;
|
|
|
|
// Hooks::run(
|
|
|
|
// Hooks::run(
|
|
|
|
// 'BitmapHandlerCheckImageArea',
|
|
|
|
// 'BitmapHandlerCheckImageArea',
|
|
|
|
// [ $file, &$params, &$checkImageAreaHookResult ]
|
|
|
|
// [ file, ¶msVar, &checkImageAreaHookResult ]
|
|
|
|
// );
|
|
|
|
// );
|
|
|
|
//
|
|
|
|
//
|
|
|
|
// if ( !is_null( $checkImageAreaHookResult ) ) {
|
|
|
|
// if (!is_null(checkImageAreaHookResult)) {
|
|
|
|
// // was set by hook, so return that value
|
|
|
|
// // was set by hook, so return that value
|
|
|
|
// return (boolean)$checkImageAreaHookResult;
|
|
|
|
// return (boolean)checkImageAreaHookResult;
|
|
|
|
// }
|
|
|
|
// }
|
|
|
|
//
|
|
|
|
//
|
|
|
|
// $srcWidth = $file->getWidth( $params['page'] );
|
|
|
|
// srcWidth = file.getWidth(paramsVar['page']);
|
|
|
|
// $srcHeight = $file->getHeight( $params['page'] );
|
|
|
|
// srcHeight = file.getHeight(paramsVar['page']);
|
|
|
|
//
|
|
|
|
//
|
|
|
|
// if ( $srcWidth * $srcHeight > $wgMaxImageArea
|
|
|
|
// if (srcWidth * srcHeight > wgMaxImageArea
|
|
|
|
// && !( $file->getMimeType() == 'image/jpeg'
|
|
|
|
// && !(file.getMimeType() == 'image/jpeg'
|
|
|
|
// && $this->getScalerType( false, false ) == 'im' )
|
|
|
|
// && this.getScalerType(false, false) == 'im')
|
|
|
|
// ) {
|
|
|
|
// ) {
|
|
|
|
// # Only ImageMagick can efficiently downsize jpg images without loading
|
|
|
|
// // Only ImageMagick can efficiently downsize jpg images without loading
|
|
|
|
// # the entire file in memory
|
|
|
|
// // the entire file in memory
|
|
|
|
// return false;
|
|
|
|
// return false;
|
|
|
|
// }
|
|
|
|
// }
|
|
|
|
// return true;
|
|
|
|
// return true;
|
|
|
|
|
gnosygnu
8 years ago