[Mapbender-commits] r8710 - trunk/mapbender/http/classes

[svn_mapbender at osgeo.org]

Author: armin11
Date: 2013-10-04 02:45:51 -0700 (Fri, 04 Oct 2013)
New Revision: 8710

Modified:
   trunk/mapbender/http/classes/class_weldMaps2PNG.php
Log:
Fix for printing multi channel images. Further things have to be investigated. Printing with opacity other than 1 is not possible for such pictures. TODO

Modified: trunk/mapbender/http/classes/class_weldMaps2PNG.php
===================================================================
--- trunk/mapbender/http/classes/class_weldMaps2PNG.php	2013-10-04 08:42:14 UTC (rev 8709)
+++ trunk/mapbender/http/classes/class_weldMaps2PNG.php	2013-10-04 09:45:51 UTC (rev 8710)
@@ -54,11 +54,15 @@
 			$opacity = $opacities[$i] *100;
 			
 			if($img != false){
-				if(imagecolortransparent($img) > -1 ){
-					imagecopymerge($image, $img, 0, 0, 0, 0, $width, $height,$opacity);
-				}else{
-					$this->filter_opacity($img,$opacity);
-				imagecopy($image, $img, 0, 0, 0, 0, $width, $height);
+				if ($opacity != 100) {
+					if(imagecolortransparent($img) > -1 ){
+						imagecopymerge($image, $img, 0, 0, 0, 0, $width, $height,$opacity);
+					} else {
+						$this->filter_opacity($img,$opacity);
+						imagecopy($image, $img, 0, 0, 0, 0, $width, $height);
+					}
+				} else {
+					imagecopy($image, $img, 0, 0, 0, 0, $width, $height);
 				}
 				@imagedestroy($img); 
 			}