Changed -colorspace RGB to -colorspace sRGB - a fix for darker images with newer versions of ImageMagick

git-svn-id: http://svn.resourcespace.org/svn/resourcespace@3796 c08608d7-6e46-0410-86ca-f2a6f1370df5

Author: danh

include/image_processing.php

@@ -889,7 +889,7 @@ function create_previews_using_im($ref,$thumbonly=false,$extension="jpg",$previe
 				} else {
 					// use existing strategy for color profiles
 					# Preserve colour profiles? (omit for smaller sizes)   
-					$profile="+profile \"*\" -colorspace RGB"; # By default, strip the colour profiles ('+' is remove the profile, confusingly)
+					$profile="+profile \"*\" -colorspace sRGB"; # By default, strip the colour profiles ('+' is remove the profile, confusingly)
 					if ($imagemagick_preserve_profiles && $id!="thm" && $id!="col" && $id!="pre" && $id!="scr") {$profile="";}
 				}
 

include/preview_preprocessing.php

@@ -571,7 +571,7 @@
     $prefix="";
 
 	# Preserve colour profiles?    
-	$profile="+profile icc -colorspace RGB"; # By default, strip the colour profiles ('+' is remove the profile, confusingly)
+	$profile="+profile icc -colorspace sRGB"; # By default, strip the colour profiles ('+' is remove the profile, confusingly)
     if ($imagemagick_preserve_profiles) {$profile="";}
 
     # CR2 files need a cr2: prefix
@@ -609,7 +609,7 @@
 			$eps_density_x = $eps_data_x / $eps_bbox_x * 72;
 			$eps_density_y = $eps_data_y / $eps_bbox_y * 72;
 			$eps_target=get_resource_path($ref,true,"",false,"miff");
-			$nfcommand = $convert_fullpath . ' -compress zip -colorspace RGB -quality 100 -density ' . sprintf("%.1f", $eps_density_x ). 'x' . sprintf("%.1f", $eps_density_y) . ' ' . escapeshellarg($file) . '[0] ' . escapeshellarg($eps_target);
+			$nfcommand = $convert_fullpath . ' -compress zip -colorspace sRGB -quality 100 -density ' . sprintf("%.1f", $eps_density_x ). 'x' . sprintf("%.1f", $eps_density_y) . ' ' . escapeshellarg($file) . '[0] ' . escapeshellarg($eps_target);
 			run_command($nfcommand);
 			if (file_exists($eps_target))
 			{

pages/ajax/contactsheet.php

@@ -317,7 +317,7 @@ public function Footer() {
         $convert_fullpath = get_utility_path("im-convert");
         if ($convert_fullpath==false) {exit("Could not find ImageMagick 'convert' utility at location '$imagemagick_path'");}
 
-        $command = $convert_fullpath . " -resize ".$contact_sheet_preview_size." -quality 90 -colorspace RGB \"".get_temp_dir() . "/contactsheetrip.jpg\" \"".get_temp_dir() . "/contactsheet.jpg\"";
+        $command = $convert_fullpath . " -resize ".$contact_sheet_preview_size." -quality 90 -colorspace sRGB \"".get_temp_dir() . "/contactsheetrip.jpg\" \"".get_temp_dir() . "/contactsheet.jpg\"";
 		run_command($command);
 		exit();
 		}

pages/view.php

@@ -159,6 +159,7 @@ function directDownload(url)
 	</script>";
 	}
 
+	
 # Show the header/sidebar
 include "../include/header.php";
 
@@ -1099,7 +1100,8 @@ function SelectTab(tab)
 
 
 
-<?php if ($enable_find_similar) { ?>
+<?php 
+if ($enable_find_similar) { ?>
 <!--Panel for search for similar resources-->
 <div class="RecordBox">
 <div class="RecordPanel"> 
@@ -1144,7 +1146,7 @@ function UpdateResultCount()
 <div class="clearerleft"> </div>
 <br />
 <input name="search" type="submit" value="&nbsp;&nbsp;<?php echo $lang["searchbutton"]?>&nbsp;&nbsp;" id="dosearch"/>
-<iframe src="blank.html" frameborder=0 scrolling=no width=1 height=1 style="visibility:hidden;" name="resultcount" id="resultcount"></iframe>
+
 </form>
 <div class="clearerleft"> </div>
 </div>
@@ -1157,6 +1159,5 @@ function UpdateResultCount()
 
 <?php } # end of block that requires search permissions
 
-
 include "../include/footer.php";
 ?>

plugins/annotate/include/general.php

@@ -224,7 +224,7 @@ public function MultiRow($left, $right) {
 		if (!file_exists($command)) {$command=$imagemagick_path . "/convert";}
 		if (!file_exists($command)) {exit("Could not find ImageMagick 'convert' utility at location '$command'");}	
 
-		$command.= " -resize $contact_sheet_preview_size -quality 90 -colorspace RGB " . escapeshellarg($jpgstoragepath) ." " . escapeshellarg($jpgstoragepath);
+		$command.= " -resize $contact_sheet_preview_size -quality 90 -colorspace sRGB " . escapeshellarg($jpgstoragepath) ." " . escapeshellarg($jpgstoragepath);
 		run_command($command);
 		return true;
 		}