Permalink
Browse files

merge in changes from 1.4.x

  • Loading branch information...
2 parents 58c7850 + e511868 commit 6ae211968a2a695910840958beb39623a909eb7b @olt olt committed May 9, 2012
Showing with 1 addition and 2 deletions.
  1. +1 −2 mapproxy/image/merge.py
View
@@ -54,10 +54,9 @@ def merge(self, image_opts, size=None, bbox=None, bbox_srs=None, coverage=None):
if len(self.layers) == 1:
layer_img, layer = self.layers[0]
layer_opts = layer_img.image_opts
-
if (((layer_opts and not layer_opts.transparent) or image_opts.transparent)
and (not size or size == layer_img.size)
- and (layer and not layer.coverage or not layer.coverage.clip)):
+ and (not layer or not layer.coverage or not layer.coverage.clip)):
# layer is opaque, no need to make transparent or add bgcolor
return layer_img

0 comments on commit 6ae2119

Please sign in to comment.