slp
/
po
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Ensure we always strip the ICM profile from generated images.

This commit is contained in:
Solomon Peachy 2009-03-25 11:21:19 -04:00
parent 97925c525a
commit 9185ac0a83
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES
View File

@ -63,6 +63,9 @@ For further information about Photo Organizer, see its web site at:
[misc] Display the image number in the slide tooltip.
[fix] Ensure any selected slides show it when the page is refreshed.
[fix] Fix text on subscription add page. [#404]
[fix] Bogus memcache call.
[fix] Syntax error when importing single images.
[fix] Ensure we always strip the ICM profile out of generated images.
2.36.2 (???)

9
src/include/import.php
View File

@ -972,9 +972,6 @@ function import_generate_scaled($input_file_name, $output_file_name,
switch ($size_key) {
case 'thumb':
$size_name = 'thumb';
if (!$use_gm) {
$resize_cmd = ' -thumbnail ';
}
$resize_cmd = ' -resize ';
$resize_cmd .= escapeshellarg($po_options[$size_key.'_max_size'] ."x". $po_options[$size_key.'_max_size']) ."\> ";
break;
@ -1005,12 +1002,14 @@ function import_generate_scaled($input_file_name, $output_file_name,
$im_profile_a = $im_profile_b = "";
if ($colorspace != "" && $colorspace > "1") {
$im_profile_b = " -profile " . $icc_profiles[1]['file'] . " +profile icm";
$im_profile_b = " -profile " . $icc_profiles[1]['file'];
if ($colorspace != "99") {
$im_profile_a = " +profile icm -profile " . $icc_profiles[$colorspace]['file'];
}
}
# Ensure we strip all profiles out of the final image..
$im_profile_b += " +profile icm ";
$output .= "<li>".$strings['import_generating_'.$size_name] ." ... ";