mirror/php-cimage
1
0
Fork 0
mirror of https://github.com/mosbth/cimage.git synced 2025-08-01 14:00:08 +02:00
Code Issues Releases Wiki Activity

merged img.php

Browse Source
This commit is contained in:
Mikael Roos
2015-12-07 17:35:53 +01:00
parent 0f3c1b4bde
commit 276f46fce2
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
webroot/img.php
View File

@@ -1011,11 +1011,7 @@ if ($srgb || $srgbDefault) {
$filename = $img->convert2sRGBColorSpace( $filename = $img->convert2sRGBColorSpace(
$srcImage, $srcImage,
$imagePath, $imagePath,
<<<<<<< HEAD
$srgbDir,
=======
$cache->getPathToSubdir("srgb"), $cache->getPathToSubdir("srgb"),
>>>>>>> master
$srgbColorProfile, $srgbColorProfile,
$useCache $useCache
); );