Merge branch 'master' of github.com:openlayers/ol3 into vector

src/ol/renderer/canvas/canvaslayerrenderer.js

@@ -1,7 +1,5 @@
 goog.provide('ol.renderer.canvas.Layer');
 
-goog.require('ol.FrameState');
-goog.require('ol.layer.LayerState');
 goog.require('ol.renderer.Layer');
 
 
@@ -28,10 +26,3 @@ ol.renderer.canvas.Layer.prototype.getImage = goog.abstractMethod;
  * @return {!goog.vec.Mat4.Number} Transform.
  */
 ol.renderer.canvas.Layer.prototype.getTransform = goog.abstractMethod;
-
-
-/**
- * @param {ol.FrameState} frameState Frame state.
- * @param {ol.layer.LayerState} layerState Layer state.
- */
-ol.renderer.canvas.Layer.prototype.renderFrame = goog.abstractMethod;

src/ol/renderer/canvas/canvasmaprenderer.js

@@ -123,17 +123,20 @@ ol.renderer.canvas.Map.prototype.renderFrame = function(frameState) {
     var layerRenderer = this.getLayerRenderer(layer);
     layerRenderer.renderFrame(frameState, layerState);
 
-    var transform = layerRenderer.getTransform();
-    context.setTransform(
-        goog.vec.Mat4.getElement(transform, 0, 0),
-        goog.vec.Mat4.getElement(transform, 1, 0),
-        goog.vec.Mat4.getElement(transform, 0, 1),
-        goog.vec.Mat4.getElement(transform, 1, 1),
-        goog.vec.Mat4.getElement(transform, 0, 3),
-        goog.vec.Mat4.getElement(transform, 1, 3));
+    var image = layerRenderer.getImage();
+    if (!goog.isNull(image)) {
+      var transform = layerRenderer.getTransform();
+      context.setTransform(
+          goog.vec.Mat4.getElement(transform, 0, 0),
+          goog.vec.Mat4.getElement(transform, 1, 0),
+          goog.vec.Mat4.getElement(transform, 0, 1),
+          goog.vec.Mat4.getElement(transform, 1, 1),
+          goog.vec.Mat4.getElement(transform, 0, 3),
+          goog.vec.Mat4.getElement(transform, 1, 3));
 
-    context.globalAlpha = layerState.opacity;
-    context.drawImage(layerRenderer.getImage(), 0, 0);
+      context.globalAlpha = layerState.opacity;
+      context.drawImage(image, 0, 0);
+    }
 
   }, this);