Merge "Http::getProxy() method to get proxy configuration"

[lhc/web/wiklou.git] / includes / media / Jpeg.php

diff --git a/includes/media/Jpeg.php b/includes/media/Jpeg.php
index 5463922..b8b6f6c 100644 (file)
--- a/includes/media/Jpeg.php
+++ b/includes/media/Jpeg.php
@@ -42,7 +42,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 +58,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 +67,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
@@ -137,7 +137,7 @@ class JpegHandler extends ExifBitmapHandler {
 
                $rotation = ( $params['rotation'] + $this->getRotation( $file ) ) % 360;
 
-               if ( $wgJpegTran && is_file( $wgJpegTran ) ) {
+               if ( $wgJpegTran && is_executable( $wgJpegTran ) ) {
                        $cmd = wfEscapeShellArg( $wgJpegTran ) .
                                " -rotate " . wfEscapeShellArg( $rotation ) .
                                " -outfile " . wfEscapeShellArg( $params['dstPath'] ) .