Merge pull request #4413 from bartvde/issue-4406

Revert "Merge pull request #4339 from bartvde/issue-4337"

src/ol/render/canvas/canvasreplay.js

@@ -344,10 +344,8 @@ ol.render.canvas.Replay.prototype.replay_ = function(
             context.globalAlpha = alpha * opacity;
           }
 
-          var w = width - originX;
+          context.drawImage(image, originX, originY, width, height,
-          var h = height - originY;
+              x, y, width * pixelRatio, height * pixelRatio);
-          context.drawImage(image, originX, originY, w, h, x, y,
-              w * pixelRatio, h * pixelRatio);
 
           if (opacity != 1) {
             context.globalAlpha = alpha;

test_rendering/spec/ol/style/icon.test.js

@@ -30,7 +30,7 @@ describe('ol.rendering.style.Icon', function() {
       disposeMap(map);
     });
 
-    function createFeatures(callback, offset) {
+    function createFeatures(callback) {
       var feature;
       feature = new ol.Feature({
         geometry: new ol.geom.Point([0, 0])
@@ -44,7 +44,6 @@ describe('ol.rendering.style.Icon', function() {
             anchorXUnits: 'fraction',
             anchorYUnits: 'pixels',
             opacity: 0.75,
-            offset: offset,
             scale: 0.5,
             img: img,
             imgSize: [32, 48]
@@ -64,14 +63,6 @@ describe('ol.rendering.style.Icon', function() {
       });
     });
 
-    it('tests the canvas renderer with an offset', function(done) {
-      map = createMap('canvas');
-      createFeatures(function() {
-        expectResemble(map, 'spec/ol/style/expected/icon-canvas-offset.png',
-            IMAGE_TOLERANCE, done);
-      }, [10, 10]);
-    });
-
     it('tests the WebGL renderer', function(done) {
       assertWebGL();
       map = createMap('webgl');