X-Git-Url: https://jasonwoof.com/gitweb/?p=wfpl.git;a=blobdiff_plain;f=upload.php;h=8beca1c0976571f7557a49171ae21b33a69a6aba;hp=5d5c8a05c02bfc37884899a02932f4ce1893ee89;hb=15459c86d0996ab3037b1738a8be6efd378c1258;hpb=03749449736019086cc2089ad19b66d31784164b

diff --git a/upload.php b/upload.php
index 5d5c8a0..8beca1c 100644
--- a/upload.php
+++ b/upload.php
@@ -224,7 +224,7 @@ function gif_to_png($filename, $new_filename = 'just change extension') {
 		$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;
@@ -331,7 +331,7 @@ function image_w_h_or_die($filename) {
 
 
 # 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.
 #
@@ -392,7 +392,7 @@ function convert_uploaded_image($key, $path, $image_width = 0, $image_height = 0
 		$filename = $path;
 	}
 
-	$convert_params = '-colorspace RGB';
+	$convert_params = '-colorspace sRGB -auto-orient';
 	if($image_width > 0 && $image_height > 0) {
 		$convert_params .= " -geometry ${image_width}x$image_height";
 	}