first stab at improving colorspace conversion for preview images.
Requires ImageMagick with LCMS support to work, and is disabled by
default.


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

Author: ddwiggins

iccprofiles/sRGB_IEC61966-2-1_black_scaled.icc

@@ -1661,3 +1661,21 @@
 # $calibre_path="/usr/bin";
 # Files with these extensions will be passed to calibre (if enabled above) for conversion to PDF and auto thumb-preview generation.
 $calibre_extensions=array("epub","mobi","lrf","pdb","chm","cbr","cbz");
+
+
+
+# ICC Color Management Features (Experimental)
+# Note that ImageMagick must be installed and configured with LCMS support
+# for this to work
+
+# Enable extraction and use of ICC profiles from original images
+$icc_extraction = false;
+
+# target color profile for preview generation
+# the file must be located in the /iccprofiles folder
+# this target preview will be used for the conversion
+# but will not be embedded
+$icc_preview_profile = 'sRGB_IEC61966-2-1_black_scaled.icc';
+
+# additional options for profile conversion during preview generation
+$icc_preview_options = '-intent relative -black-point-compensation'; 

iccprofiles/sRGB_IEC61966-2-1_no_black_scaling.icc

@@ -1,3 +1,4 @@
+
 <?php
 /**
  * Image processing functions
@@ -74,6 +75,10 @@ function upload_file($ref,$no_exif=false,$revert=false,$autorotate=false)
     	$old_path=get_resource_path($ref,true,"",true,$old_extension);
     	if (file_exists($old_path)) {unlink($old_path);}
     	}
+
+	// also remove any existing extracted icc profiles
+    	$icc_path=get_resource_path($ref,true,"",true,'icc');
+    	if (file_exists($icc_path)) {unlink($icc_path);}
 	}	
 
 	if (!$revert){
@@ -110,7 +115,14 @@ function upload_file($ref,$no_exif=false,$revert=false,$autorotate=false)
 		}
 
      		chmod($filepath,0777);
-			$status="Your file has been uploaded.";
+
+		global $icc_extraction;
+		if ($icc_extraction){
+			extract_icc_profile($filepath);
+		}
+
+
+		$status="Your file has been uploaded.";
     	 	}
     	}
     }	
@@ -759,13 +771,36 @@ function create_previews_using_im($ref,$thumbonly=false,$extension="jpg",$previe
 				$wpath=get_resource_path($ref,true,$ps[$n]["id"],false,"jpg",-1,1,true,"",$alternative);
 				if (file_exists($wpath)){unlink($wpath);}
 
-				# Preserve colour profiles? (omit for smaller sizes)   
-				$profile="+profile \"*\" -colorspace RGB"; # By default, strip the colour profiles ('+' is remove the profile, confusingly)
-				if ($imagemagick_preserve_profiles && $id!="thm" && $id!="col" && $id!="pre" && $id!="scr") {$profile="";}
+
+				# EXPERIMENTAL CODE TO USE EXISTING ICC PROFILE IF PRESENT
+				global $icc_extraction, $icc_preview_profile, $icc_preview_options;
+				if ($icc_extraction){
+					$iccpath = get_resource_path($ref,true,'',false,'icc');
+					if (!file_exists($iccpath) && !isset($iccfound)) {
+						// extracted profile doesn't exist. Try extracting.
+						if (extract_icc_profile($file)){
+							$iccfound = true;
+						} else {
+							$iccfound = false;
+						}
+					}
+				}
+
+				if($icc_extraction && file_exists($iccpath)){
+					// we have an extracted ICC profile, so use it as source
+					$targetprofile = dirname(__FILE__) . '/../iccprofiles/' . $icc_preview_profile;
+					$profile  = " +profile \"*\" -profile $iccpath $icc_preview_options -profile $targetprofile ";
+				} 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)
+					if ($imagemagick_preserve_profiles && $id!="thm" && $id!="col" && $id!="pre" && $id!="scr") {$profile="";}
+				}
+
 
 				$runcommand = $command ." +matte $profile -resize " . $tw . "x" . $th . "\">\" ".escapeshellarg($path);
 				$output=shell_exec($runcommand);  
-				# echo $runcommand."<br>";
+				# echo $runcommand."<br>\n";
 				# Add a watermarked image too?
 				global $watermark;
 				if ($alternative==-1 && isset($watermark) && ($ps[$n]["internal"]==1 || $ps[$n]["allow_preview"]==1))
@@ -1415,4 +1450,41 @@ function AutoRotateImage ($src_image){
 }
 
 
+function extract_icc_profile($infile) {
+   global $config_windows, $imagemagick_path;
+
+   # Locate imagemagick, or fail this if it isn't installed
+   $command=$imagemagick_path . "/bin/convert";
+   if (!file_exists($command)) {$command=$imagemagick_path . "/convert";}
+   if (!file_exists($command)) {$command=$imagemagick_path . "\convert.exe";}
+   if (!file_exists($command)) {return false;}
+
+   if ($config_windows){ $stderrclause = ''; } else { $stderrclause = '2>&1'; }
+
+   // outfile will be same name as infile, except with icc ext
+   $ext = strrchr($infile,'.');
+   if ($ext !== false){
+      $outfile = substr($infile,0,-strlen($ext)) . '.icc';
+   } else {
+      $outfile = $infile . '.icc';
+   }
+
+   if (file_exists($outfile)){
+      // extracted profile already existed. We'll remove it and start over
+      unlink($outfile);
+   }
+
+   $cmdout= shell_exec("$command $infile $outfile $stderrclause ");
+   
+   if ( preg_match("/no color profile is available/",$cmdout) || !file_exists($outfile) ||filesize($outfile) == 0){
+   // the icc profile extraction failed. So delete file.
+   if (file_exists($outfile)){ unlink ($outfile); };
+   return false;
+   }
+
+   if (file_exists($outfile)) { return true; } else { return false; }
+
+}
+
+
 ?>

include/config.default.php

@@ -710,6 +710,7 @@ function delete_resource($ref)
 	$extensions[]=$resource['file_extension']?$resource['file_extension']:"jpg";
 	$extensions[]=$resource['preview_extension']?$resource['preview_extension']:"jpg";
 	$extensions[]=$GLOBALS['ffmpeg_preview_extension'];
+	$extensions[]='icc'; // also remove any extracted icc profiles
 	$extensions=array_unique($extensions);
 
 	foreach ($extensions as $extension)
@@ -1128,6 +1129,7 @@ function delete_alternative_file($resource,$ref)
 	$extensions[]=isset($info['preview_extension'])?$info['preview_extension']:"jpg";
 	$extensions[]=$GLOBALS['ffmpeg_preview_extension'];
         $extensions[]='jpg'; // always look for jpegs, just in case
+	$extensions[]='icc'; // always look for extracted icc profiles
 	$extensions=array_unique($extensions);
         $sizes = sql_array('select id value from preview_size');
 
@@ -1988,13 +1990,20 @@ function get_resource_files($ref,$includeorphan=false){
     	unset($file_checklist[$original]);
     }
 
-    // in some cases, the system also generates a jpeg equivalent of the original, so check for that
+    // in some cases, the system also generates an mp3 equivalent of the original, so check for that
     $original = get_resource_path($ref,true,'',false,'mp3');
     if (file_exists($original)){
     	array_push($filearray,$original);
     	unset($file_checklist[$original]);
     }
 
+    // in some cases, the system also generates an extracted icc profile, so check for that
+    $original = get_resource_path($ref,true,'',false,'icc');
+    if (file_exists($original)){
+    	array_push($filearray,$original);
+    	unset($file_checklist[$original]);
+    }
+
 
     # check for pages
     $page = 1;
@@ -2032,7 +2041,7 @@ function get_resource_files($ref,$includeorphan=false){
             array_push($filearray,$thepath);
             unset($file_checklist[$thepath]);
         }
-        
+
 
         // now check for previews
         foreach($sizearray as $size){
@@ -2068,6 +2077,13 @@ function get_resource_files($ref,$includeorphan=false){
 	        array_push($filearray,$original);
        		unset($file_checklist[$original]);
 	}
+
+        // in some cases, the system also generates an extracted icc profile, so check for that
+        $original = get_resource_path($ref,true,'',false,'icc',-1,1,'','',$altfile['ref']);
+	if (file_exists($original)){
+	        array_push($filearray,$original);
+       		unset($file_checklist[$original]);
+	}
     }