From ca0b77d0e30ae79a826d510ad8e0032d499c5325 Mon Sep 17 00:00:00 2001
From: Frederic Junod <frederic.junod@camptocamp.com>
Date: Thu, 12 Dec 2013 15:16:59 +0100
Subject: [PATCH] Add pixelRatio to ol.source.Image#getImage

---
 src/ol/renderer/canvas/canvasimagelayerrenderer.js | 4 ++--
 src/ol/renderer/dom/domimagelayerrenderer.js       | 4 ++--
 src/ol/renderer/webgl/webglimagelayerrenderer.js   | 4 ++--
 src/ol/source/imagesource.js                       | 1 +
 src/ol/source/imagestaticsource.js                 | 2 +-
 src/ol/source/imagewmssource.js                    | 2 +-
 src/ol/source/mapguidesource.js                    | 2 +-
 7 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/ol/renderer/canvas/canvasimagelayerrenderer.js b/src/ol/renderer/canvas/canvasimagelayerrenderer.js
index dc6a94d298..4b7e4eb534 100644
--- a/src/ol/renderer/canvas/canvasimagelayerrenderer.js
+++ b/src/ol/renderer/canvas/canvasimagelayerrenderer.js
@@ -78,8 +78,8 @@ ol.renderer.canvas.ImageLayer.prototype.prepareFrame =
   var hints = frameState.viewHints;
 
   if (!hints[ol.ViewHint.ANIMATING] && !hints[ol.ViewHint.INTERACTING]) {
-    image = imageSource.getImage(
-        frameState.extent, viewResolution, view2DState.projection);
+    image = imageSource.getImage(frameState.extent, viewResolution,
+        frameState.devicePixelRatio, view2DState.projection);
     if (!goog.isNull(image)) {
       var imageState = image.getState();
       if (imageState == ol.ImageState.IDLE) {
diff --git a/src/ol/renderer/dom/domimagelayerrenderer.js b/src/ol/renderer/dom/domimagelayerrenderer.js
index 47d7845b7a..3e82b6bac3 100644
--- a/src/ol/renderer/dom/domimagelayerrenderer.js
+++ b/src/ol/renderer/dom/domimagelayerrenderer.js
@@ -66,8 +66,8 @@ ol.renderer.dom.ImageLayer.prototype.prepareFrame =
   var hints = frameState.viewHints;
 
   if (!hints[ol.ViewHint.ANIMATING] && !hints[ol.ViewHint.INTERACTING]) {
-    var image_ = imageSource.getImage(
-        frameState.extent, viewResolution, view2DState.projection);
+    var image_ = imageSource.getImage(frameState.extent, viewResolution,
+        frameState.devicePixelRatio, view2DState.projection);
     if (!goog.isNull(image_)) {
       var imageState = image_.getState();
       if (imageState == ol.ImageState.IDLE) {
diff --git a/src/ol/renderer/webgl/webglimagelayerrenderer.js b/src/ol/renderer/webgl/webglimagelayerrenderer.js
index 9915739da3..7a3485febc 100644
--- a/src/ol/renderer/webgl/webglimagelayerrenderer.js
+++ b/src/ol/renderer/webgl/webglimagelayerrenderer.js
@@ -95,8 +95,8 @@ ol.renderer.webgl.ImageLayer.prototype.prepareFrame =
   var hints = frameState.viewHints;
 
   if (!hints[ol.ViewHint.ANIMATING] && !hints[ol.ViewHint.INTERACTING]) {
-    var image_ = imageSource.getImage(
-        frameState.extent, viewResolution, view2DState.projection);
+    var image_ = imageSource.getImage(frameState.extent, viewResolution,
+        frameState.devicePixelRatio, view2DState.projection);
     if (!goog.isNull(image_)) {
       var imageState = image_.getState();
       if (imageState == ol.ImageState.IDLE) {
diff --git a/src/ol/source/imagesource.js b/src/ol/source/imagesource.js
index 31b9c1d384..04c111af63 100644
--- a/src/ol/source/imagesource.js
+++ b/src/ol/source/imagesource.js
@@ -113,6 +113,7 @@ ol.source.Image.prototype.findNearestResolution =
 /**
  * @param {ol.Extent} extent Extent.
  * @param {number} resolution Resolution.
+ * @param {number} pixelRatio Pixel ratio.
  * @param {ol.proj.Projection} projection Projection.
  * @return {ol.Image} Single image.
  */
diff --git a/src/ol/source/imagestaticsource.js b/src/ol/source/imagestaticsource.js
index 43ce4f62bd..fd51f361be 100644
--- a/src/ol/source/imagestaticsource.js
+++ b/src/ol/source/imagestaticsource.js
@@ -48,7 +48,7 @@ goog.inherits(ol.source.ImageStatic, ol.source.Image);
  * @inheritDoc
  */
 ol.source.ImageStatic.prototype.getImage =
-    function(extent, resolution, projection) {
+    function(extent, resolution, pixelRatio, projection) {
   if (ol.extent.intersects(extent, this.image_.getExtent())) {
     return this.image_;
   }
diff --git a/src/ol/source/imagewmssource.js b/src/ol/source/imagewmssource.js
index 3a123f93b8..7f6e25ba99 100644
--- a/src/ol/source/imagewmssource.js
+++ b/src/ol/source/imagewmssource.js
@@ -69,7 +69,7 @@ ol.source.ImageWMS.prototype.getParams = function() {
  * @inheritDoc
  */
 ol.source.ImageWMS.prototype.getImage =
-    function(extent, resolution, projection) {
+    function(extent, resolution, pixelRatio, projection) {
   resolution = this.findNearestResolution(resolution);
 
   var image = this.image_;
diff --git a/src/ol/source/mapguidesource.js b/src/ol/source/mapguidesource.js
index 8389f17f10..52913f93cf 100644
--- a/src/ol/source/mapguidesource.js
+++ b/src/ol/source/mapguidesource.js
@@ -72,7 +72,7 @@ goog.inherits(ol.source.MapGuide, ol.source.Image);
  * @inheritDoc
  */
 ol.source.MapGuide.prototype.getImage =
-    function(extent, resolution, projection) {
+    function(extent, resolution, pixelRatio, projection) {
   resolution = this.findNearestResolution(resolution);
 
   var image = this.image_;