Got questions, comments, patches, etc.?
Contact Jason Woofenden
gitweb
/
wfpl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add namespacify.sh
[wfpl.git]
/
upload.php
diff --git
a/upload.php
b/upload.php
index
b1b3323
..
8beca1c
100644
(file)
--- a/
upload.php
+++ b/
upload.php
@@
-224,7
+224,7
@@
function gif_to_png($filename, $new_filename = 'just change extension') {
$new_filename .= '.png';
}
$new_filename .= '.png';
}
- imagemagick_convert($filename, $new_filename, "$convert -colorspace RGB", 'GIF to PNG conversion');
+ imagemagick_convert($filename, $new_filename, "-colorspace sRGB", 'GIF to PNG conversion');
unlink($filename);
return $new_filename;
unlink($filename);
return $new_filename;
@@
-331,7
+331,7
@@
function image_w_h_or_die($filename) {
# Like save_uploaded_file() (above) except that it converts all images to PNG
# Like save_uploaded_file() (above) except that it converts all images to PNG
-# or JPEG, converts to RGB colorspace, and optionally scales and/or creates a
+# or JPEG, converts to sRGB colorspace, and optionally scales and/or creates a
# thumbnail. And, if $path ends with a period, the correct extension will be
# appended.
#
# thumbnail. And, if $path ends with a period, the correct extension will be
# appended.
#
@@
-392,7
+392,7
@@
function convert_uploaded_image($key, $path, $image_width = 0, $image_height = 0
$filename = $path;
}
$filename = $path;
}
- $convert_params = '-colorspace RGB -auto-orient';
+ $convert_params = '-colorspace sRGB -auto-orient';
if($image_width > 0 && $image_height > 0) {
$convert_params .= " -geometry ${image_width}x$image_height";
}
if($image_width > 0 && $image_height > 0) {
$convert_params .= " -geometry ${image_width}x$image_height";
}