X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fmedia%2FJpeg.php;h=287c198c57092da24f6c4fa544f706584425fbaa;hb=ee56f00ddf0609082f8ae9a4dc3e6e1b6f54ddfd;hp=040ff96e1c778d3569aeb38504469450a2553d7c;hpb=38ba6b620be9f6333d902055ae1c0c610af4985e;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/media/Jpeg.php b/includes/media/Jpeg.php index 040ff96e1c..287c198c57 100644 --- a/includes/media/Jpeg.php +++ b/includes/media/Jpeg.php @@ -31,6 +31,8 @@ * @ingroup Media */ class JpegHandler extends ExifBitmapHandler { + const SRGB_EXIF_COLOR_SPACE = 'sRGB'; + const SRGB_ICC_PROFILE_DESCRIPTION = 'sRGB IEC61966-2.1'; function normaliseParams( $image, &$params ) { if ( !parent::normaliseParams( $image, $params ) ) { @@ -42,7 +44,7 @@ class JpegHandler extends ExifBitmapHandler { return true; } - function validateParam( $name, $value ) { + public function validateParam( $name, $value ) { if ( $name === 'quality' ) { return self::validateQuality( $value ); } else { @@ -58,7 +60,7 @@ class JpegHandler extends ExifBitmapHandler { return $value === 'low'; } - function makeParamString( $params ) { + public function makeParamString( $params ) { // Prepend quality as "qValue-". This has to match parseParamString() below $res = parent::makeParamString( $params ); if ( $res && isset( $params['quality'] ) ) { @@ -67,7 +69,7 @@ class JpegHandler extends ExifBitmapHandler { return $res; } - function parseParamString( $str ) { + public function parseParamString( $str ) { // $str contains "qlow-200px" or "200px" strings because thumb.php would strip the filename // first - check if the string begins with "qlow-", and if so, treat it as quality. // Pass the first portion, or the whole string if "qlow-" not found, to the parent @@ -112,8 +114,8 @@ class JpegHandler extends ExifBitmapHandler { wfDebug( __METHOD__ . ': ' . $e->getMessage() . "\n" ); /* This used to use 0 (ExifBitmapHandler::OLD_BROKEN_FILE) for the cases - * * No metadata in the file - * * Something is broken in the file. + * * No metadata in the file + * * Something is broken in the file. * However, if the metadata support gets expanded then you can't tell if the 0 is from * a broken file, or just no props found. A broken file is likely to stay broken, but * a file which had no props could have props once the metadata support is improved. @@ -130,7 +132,7 @@ class JpegHandler extends ExifBitmapHandler { * @param array $params Rotate parameters. * 'rotation' clockwise rotation in degrees, allowed are multiples of 90 * @since 1.21 - * @return bool + * @return bool|MediaTransformError */ public function rotate( $file, $params ) { global $wgJpegTran; @@ -171,4 +173,118 @@ class JpegHandler extends ExifBitmapHandler { return $params; } + + /** + * @inheritDoc + */ + protected function transformImageMagick( $image, $params ) { + global $wgUseTinyRGBForJPGThumbnails; + + $ret = parent::transformImageMagick( $image, $params ); + + if ( $ret ) { + return $ret; + } + + if ( $wgUseTinyRGBForJPGThumbnails ) { + // T100976 If the profile embedded in the JPG is sRGB, swap it for the smaller + // (and free) TinyRGB + + /** + * We'll want to replace the color profile for JPGs: + * * in the sRGB color space, or with the sRGB profile + * (other profiles will be left untouched) + * * without color space or profile, in which case browsers + * should assume sRGB, but don't always do (e.g. on wide-gamut + * monitors (unless it's meant for low bandwith) + * @see https://phabricator.wikimedia.org/T134498 + */ + $colorSpaces = [ self::SRGB_EXIF_COLOR_SPACE, '-' ]; + $profiles = [ self::SRGB_ICC_PROFILE_DESCRIPTION ]; + + // we'll also add TinyRGB profile to images lacking a profile, but + // only if they're not low quality (which are meant to save bandwith + // and we don't want to increase the filesize by adding a profile) + if ( isset( $params['quality'] ) && $params['quality'] > 30 ) { + $profiles[] = '-'; + } + + $this->swapICCProfile( + $params['dstPath'], + $colorSpaces, + $profiles, + realpath( __DIR__ ) . '/tinyrgb.icc' + ); + } + + return false; + } + + /** + * Swaps an embedded ICC profile for another, if found. + * Depends on exiftool, no-op if not installed. + * @param string $filepath File to be manipulated (will be overwritten) + * @param array $colorSpaces Only process files with this/these Color Space(s) + * @param array $oldProfileStrings Exact name(s) of color profile to look for + * (the one that will be replaced) + * @param string $profileFilepath ICC profile file to apply to the file + * @since 1.26 + * @return bool + */ + public function swapICCProfile( $filepath, array $colorSpaces, + array $oldProfileStrings, $profileFilepath + ) { + global $wgExiftool; + + if ( !$wgExiftool || !is_executable( $wgExiftool ) ) { + return false; + } + + $cmd = wfEscapeShellArg( $wgExiftool, + '-EXIF:ColorSpace', + '-ICC_Profile:ProfileDescription', + '-S', + '-T', + $filepath + ); + + $output = wfShellExecWithStderr( $cmd, $retval ); + + // Explode EXIF data into an array with [0 => Color Space, 1 => Device Model Desc] + $data = explode( "\t", trim( $output ) ); + + if ( $retval !== 0 ) { + return false; + } + + // Make a regex out of the source data to match it to an array of color + // spaces in a case-insensitive way + $colorSpaceRegex = '/'.preg_quote( $data[0], '/' ).'/i'; + if ( empty( preg_grep( $colorSpaceRegex, $colorSpaces ) ) ) { + // We can't establish that this file matches the color space, don't process it + return false; + } + + $profileRegex = '/'.preg_quote( $data[1], '/' ).'/i'; + if ( empty( preg_grep( $profileRegex, $oldProfileStrings ) ) ) { + // We can't establish that this file has the expected ICC profile, don't process it + return false; + } + + $cmd = wfEscapeShellArg( $wgExiftool, + '-overwrite_original', + '-icc_profile<=' . $profileFilepath, + $filepath + ); + + $output = wfShellExecWithStderr( $cmd, $retval ); + + if ( $retval !== 0 ) { + $this->logErrorForExternalProcess( $retval, $output, $cmd ); + + return false; + } + + return true; + } }