From 06a5f431c24c264df21d6b1f943c9c78c070f99e Mon Sep 17 00:00:00 2001 From: Jasper Chen Date: Sun, 24 May 2015 20:23:27 +0800 Subject: [PATCH 1/3] Fixed CYMK to RGB conversion when Magento compiler is on. --- .../community/Varien/Image/Adapter/Imagemagic.php | 5 +++-- .../icc_profiles/USWebUncoated.icc | Bin .../PerfectWatermarks}/icc_profiles/sRGB.icc | Bin 3 files changed, 3 insertions(+), 2 deletions(-) rename src/{app/code/community/Varien/Image/Adapter => lib/FireGento/PerfectWatermarks}/icc_profiles/USWebUncoated.icc (100%) rename src/{app/code/community/Varien/Image/Adapter => lib/FireGento/PerfectWatermarks}/icc_profiles/sRGB.icc (100%) diff --git a/src/app/code/community/Varien/Image/Adapter/Imagemagic.php b/src/app/code/community/Varien/Image/Adapter/Imagemagic.php index a5c6ce2..494a869 100644 --- a/src/app/code/community/Varien/Image/Adapter/Imagemagic.php +++ b/src/app/code/community/Varien/Image/Adapter/Imagemagic.php @@ -163,14 +163,15 @@ public function resize($frameWidth = null, $frameHeight = null) $profiles = $imagick->getimageprofiles('*', false); // we're only interested if ICC profile(s) exist $has_icc_profile = (array_search('icc', $profiles) !== false); + $lib_base_dir = Mage::getBaseDir('lib'); // if it doesnt have a CMYK ICC profile, we add one if ($has_icc_profile === false) { - $icc_cmyk = file_get_contents(__DIR__ . '/icc_profiles/USWebUncoated.icc'); + $icc_cmyk = file_get_contents($lib_base_dir. '/FireGento/PerfectWatermarks/icc_profiles/USWebUncoated.icc'); $imagick->profileImage('icc', $icc_cmyk); unset($icc_cmyk); } // then we add an RGB profile - $icc_rgb = file_get_contents(__DIR__ . '/icc_profiles/sRGB.icc'); + $icc_rgb = file_get_contents($lib_base_dir . '/FireGento/PerfectWatermarks/icc_profiles/sRGB.icc'); $imagick->profileImage('icc', $icc_rgb); unset($icc_rgb); $imagick->setimagecolorspace(Imagick::COLORSPACE_SRGB); diff --git a/src/app/code/community/Varien/Image/Adapter/icc_profiles/USWebUncoated.icc b/src/lib/FireGento/PerfectWatermarks/icc_profiles/USWebUncoated.icc similarity index 100% rename from src/app/code/community/Varien/Image/Adapter/icc_profiles/USWebUncoated.icc rename to src/lib/FireGento/PerfectWatermarks/icc_profiles/USWebUncoated.icc diff --git a/src/app/code/community/Varien/Image/Adapter/icc_profiles/sRGB.icc b/src/lib/FireGento/PerfectWatermarks/icc_profiles/sRGB.icc similarity index 100% rename from src/app/code/community/Varien/Image/Adapter/icc_profiles/sRGB.icc rename to src/lib/FireGento/PerfectWatermarks/icc_profiles/sRGB.icc From a36be84c25ab2fa5deddae9312954d8603f8b972 Mon Sep 17 00:00:00 2001 From: Jasper Chen Date: Sun, 24 May 2015 20:27:32 +0800 Subject: [PATCH 2/3] Fixed CYMK to RGB conversion when Magento compiler is on. --- src/app/code/community/Varien/Image/Adapter/Imagemagic.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/code/community/Varien/Image/Adapter/Imagemagic.php b/src/app/code/community/Varien/Image/Adapter/Imagemagic.php index 494a869..ba80fdd 100644 --- a/src/app/code/community/Varien/Image/Adapter/Imagemagic.php +++ b/src/app/code/community/Varien/Image/Adapter/Imagemagic.php @@ -163,7 +163,7 @@ public function resize($frameWidth = null, $frameHeight = null) $profiles = $imagick->getimageprofiles('*', false); // we're only interested if ICC profile(s) exist $has_icc_profile = (array_search('icc', $profiles) !== false); - $lib_base_dir = Mage::getBaseDir('lib'); + $lib_base_dir = Mage::getBaseDir('lib'); // if it doesnt have a CMYK ICC profile, we add one if ($has_icc_profile === false) { $icc_cmyk = file_get_contents($lib_base_dir. '/FireGento/PerfectWatermarks/icc_profiles/USWebUncoated.icc'); From e44c8f05328dfbd1c7d8bda56bd3c3a5111625f3 Mon Sep 17 00:00:00 2001 From: Jasper Chen Date: Sun, 24 May 2015 20:33:22 +0800 Subject: [PATCH 3/3] Fixed code formatting --- src/app/code/community/Varien/Image/Adapter/Imagemagic.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/code/community/Varien/Image/Adapter/Imagemagic.php b/src/app/code/community/Varien/Image/Adapter/Imagemagic.php index ba80fdd..e7eea66 100644 --- a/src/app/code/community/Varien/Image/Adapter/Imagemagic.php +++ b/src/app/code/community/Varien/Image/Adapter/Imagemagic.php @@ -166,7 +166,7 @@ public function resize($frameWidth = null, $frameHeight = null) $lib_base_dir = Mage::getBaseDir('lib'); // if it doesnt have a CMYK ICC profile, we add one if ($has_icc_profile === false) { - $icc_cmyk = file_get_contents($lib_base_dir. '/FireGento/PerfectWatermarks/icc_profiles/USWebUncoated.icc'); + $icc_cmyk = file_get_contents($lib_base_dir . '/FireGento/PerfectWatermarks/icc_profiles/USWebUncoated.icc'); $imagick->profileImage('icc', $icc_cmyk); unset($icc_cmyk); }