[Mapbender-commits] r8714 - branches/2.7/http/classes

[svn_mapbender at osgeo.org]

Author: verenadiewald
Date: 2013-10-07 04:53:08 -0700 (Mon, 07 Oct 2013)
New Revision: 8714

Modified:
   branches/2.7/http/classes/class_weldMaps2PNG.php
Log:
https://trac.osgeo.org/mapbender/ticket/910

Modified: branches/2.7/http/classes/class_weldMaps2PNG.php
===================================================================
--- branches/2.7/http/classes/class_weldMaps2PNG.php	2013-10-07 11:47:20 UTC (rev 8713)
+++ branches/2.7/http/classes/class_weldMaps2PNG.php	2013-10-07 11:53:08 UTC (rev 8714)
@@ -54,10 +54,14 @@
 			$opacity = $opacities[$i] *100;
 			
 			if($img != false){
+				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);