From 6a6d2cd6129c0f1b8a6a0030a936e63a00b8a025 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maximilian=20Kr=C3=B6g?= <maxi_kroeg@web.de>
Date: Sat, 30 Jul 2022 22:36:32 +0200
Subject: [PATCH] Remove IE image smoothing fallback

---
 src/ol/renderer/canvas/ImageLayer.js |  5 ++---
 src/ol/renderer/canvas/TileLayer.js  |  5 ++---
 src/ol/renderer/canvas/common.js     | 21 ---------------------
 src/ol/reproj.js                     |  5 ++---
 src/ol/source/ImageStatic.js         |  3 +--
 5 files changed, 7 insertions(+), 32 deletions(-)
 delete mode 100644 src/ol/renderer/canvas/common.js

diff --git a/src/ol/renderer/canvas/ImageLayer.js b/src/ol/renderer/canvas/ImageLayer.js
index 23f505e7c7..9e9fb57aeb 100644
--- a/src/ol/renderer/canvas/ImageLayer.js
+++ b/src/ol/renderer/canvas/ImageLayer.js
@@ -5,7 +5,6 @@ import CanvasLayerRenderer from './Layer.js';
 import ImageState from '../../ImageState.js';
 import ViewHint from '../../ViewHint.js';
 import {ENABLE_RASTER_REPROJECTION} from '../../reproj/common.js';
-import {IMAGE_SMOOTHING_DISABLED, IMAGE_SMOOTHING_ENABLED} from './common.js';
 import {
   apply as applyTransform,
   compose as composeTransform,
@@ -238,7 +237,7 @@ class CanvasImageLayerRenderer extends CanvasLayerRenderer {
     const dh = img.height * transform[3];
 
     if (!this.getLayer().getSource().getInterpolate()) {
-      Object.assign(context, IMAGE_SMOOTHING_DISABLED);
+      context.imageSmoothingEnabled = false;
     }
 
     this.preRender(context, frameState);
@@ -261,7 +260,7 @@ class CanvasImageLayerRenderer extends CanvasLayerRenderer {
     if (clipped) {
       context.restore();
     }
-    Object.assign(context, IMAGE_SMOOTHING_ENABLED);
+    context.imageSmoothingEnabled = true;
 
     if (canvasTransform !== canvas.style.transform) {
       canvas.style.transform = canvasTransform;
diff --git a/src/ol/renderer/canvas/TileLayer.js b/src/ol/renderer/canvas/TileLayer.js
index 63a9bd8dc4..4778966b7d 100644
--- a/src/ol/renderer/canvas/TileLayer.js
+++ b/src/ol/renderer/canvas/TileLayer.js
@@ -6,7 +6,6 @@ import ImageTile from '../../ImageTile.js';
 import ReprojTile from '../../reproj/Tile.js';
 import TileRange from '../../TileRange.js';
 import TileState from '../../TileState.js';
-import {IMAGE_SMOOTHING_DISABLED, IMAGE_SMOOTHING_ENABLED} from './common.js';
 import {
   apply as applyTransform,
   compose as composeTransform,
@@ -410,7 +409,7 @@ class CanvasTileLayerRenderer extends CanvasLayerRenderer {
     }
 
     if (!tileSource.getInterpolate()) {
-      Object.assign(context, IMAGE_SMOOTHING_DISABLED);
+      context.imageSmoothingEnabled = false;
     }
 
     this.preRender(context, frameState);
@@ -561,7 +560,7 @@ class CanvasTileLayerRenderer extends CanvasLayerRenderer {
     if (layerState.extent) {
       context.restore();
     }
-    Object.assign(context, IMAGE_SMOOTHING_ENABLED);
+    context.imageSmoothingEnabled = true;
 
     if (canvasTransform !== canvas.style.transform) {
       canvas.style.transform = canvasTransform;
diff --git a/src/ol/renderer/canvas/common.js b/src/ol/renderer/canvas/common.js
deleted file mode 100644
index 81d185bef8..0000000000
--- a/src/ol/renderer/canvas/common.js
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- * @module ol/renderer/canvas/common
- */
-
-/**
- * Context options to disable image smoothing.
- * @type {Object}
- */
-export const IMAGE_SMOOTHING_DISABLED = {
-  imageSmoothingEnabled: false,
-  msImageSmoothingEnabled: false,
-};
-
-/**
- * Context options to enable image smoothing.
- * @type {Object}
- */
-export const IMAGE_SMOOTHING_ENABLED = {
-  imageSmoothingEnabled: true,
-  msImageSmoothingEnabled: true,
-};
diff --git a/src/ol/reproj.js b/src/ol/reproj.js
index eb7d58d3e0..3d54c1c3de 100644
--- a/src/ol/reproj.js
+++ b/src/ol/reproj.js
@@ -1,7 +1,6 @@
 /**
  * @module ol/reproj
  */
-import {IMAGE_SMOOTHING_DISABLED} from './renderer/canvas/common.js';
 import {
   containsCoordinate,
   createEmpty,
@@ -226,7 +225,7 @@ export function render(
   );
 
   if (!opt_interpolate) {
-    Object.assign(context, IMAGE_SMOOTHING_DISABLED);
+    context.imageSmoothingEnabled = false;
   }
 
   if (sources.length === 0) {
@@ -254,7 +253,7 @@ export function render(
   );
 
   if (!opt_interpolate) {
-    Object.assign(stitchContext, IMAGE_SMOOTHING_DISABLED);
+    stitchContext.imageSmoothingEnabled = false;
   }
 
   const stitchScale = pixelRatio / sourceResolution;
diff --git a/src/ol/source/ImageStatic.js b/src/ol/source/ImageStatic.js
index d2cc158d85..3e94271933 100644
--- a/src/ol/source/ImageStatic.js
+++ b/src/ol/source/ImageStatic.js
@@ -6,7 +6,6 @@ import EventType from '../events/EventType.js';
 import ImageSource, {defaultImageLoadFunction} from './Image.js';
 import ImageState from '../ImageState.js';
 import ImageWrapper from '../Image.js';
-import {IMAGE_SMOOTHING_DISABLED} from '../renderer/canvas/common.js';
 import {createCanvasContext2D} from '../dom.js';
 import {getHeight, getWidth, intersects} from '../extent.js';
 import {get as getProjection} from '../proj.js';
@@ -157,7 +156,7 @@ class Static extends ImageSource {
       if (targetWidth !== imageWidth || targetHeight !== imageHeight) {
         const context = createCanvasContext2D(targetWidth, targetHeight);
         if (!this.getInterpolate()) {
-          Object.assign(context, IMAGE_SMOOTHING_DISABLED);
+          context.imageSmoothingEnabled = false;
         }
         const canvas = context.canvas;
         context.drawImage(