dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Fix small typos"
[lhc/web/wiklou.git]
/
includes
/
media
/
JpegHandler.php
diff --git
a/includes/media/JpegHandler.php
b/includes/media/JpegHandler.php
index
f7de5f5
..
4bcb53d
100644
(file)
--- a/
includes/media/JpegHandler.php
+++ b/
includes/media/JpegHandler.php
@@
-34,7
+34,7
@@
class JpegHandler extends ExifBitmapHandler {
const SRGB_EXIF_COLOR_SPACE = 'sRGB';
const SRGB_ICC_PROFILE_DESCRIPTION = 'sRGB IEC61966-2.1';
const SRGB_EXIF_COLOR_SPACE = 'sRGB';
const SRGB_ICC_PROFILE_DESCRIPTION = 'sRGB IEC61966-2.1';
- function normaliseParams( $image, &$params ) {
+
public
function normaliseParams( $image, &$params ) {
if ( !parent::normaliseParams( $image, $params ) ) {
return false;
}
if ( !parent::normaliseParams( $image, $params ) ) {
return false;
}
@@
-90,7
+90,7
@@
class JpegHandler extends ExifBitmapHandler {
return $res;
}
return $res;
}
- function getScriptParams( $params ) {
+
protected
function getScriptParams( $params ) {
$res = parent::getScriptParams( $params );
if ( isset( $params['quality'] ) ) {
$res['quality'] = $params['quality'];
$res = parent::getScriptParams( $params );
if ( isset( $params['quality'] ) ) {
$res['quality'] = $params['quality'];
@@
-98,7
+98,7
@@
class JpegHandler extends ExifBitmapHandler {
return $res;
}
return $res;
}
- function getMetadata( $image, $filename ) {
+
public
function getMetadata( $image, $filename ) {
try {
$meta = BitmapMetadataHandler::Jpeg( $filename );
if ( !is_array( $meta ) ) {
try {
$meta = BitmapMetadataHandler::Jpeg( $filename );
if ( !is_array( $meta ) ) {