From dfd9334130d2f8480ba5eefb19590d8db1a40451 Mon Sep 17 00:00:00 2001 From: ExE Boss Date: Thu, 6 Apr 2017 19:35:47 +0200 Subject: [PATCH 1/2] Fix windows build Fixes the \r symbol remaining at the end of `entry` in the file `utils/update-flash-refs.js:194`, which resulted in the build not working on Windows. Signed-off-by: ExE Boss --- AUTHORS | 1 + utils/update-flash-refs.js | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/AUTHORS b/AUTHORS index 7b4ab142d3..26869e7828 100644 --- a/AUTHORS +++ b/AUTHORS @@ -15,3 +15,4 @@ Jeff Dyer Till Schneidereit Jet Villegas Claus Wahlers +ExE Boss diff --git a/utils/update-flash-refs.js b/utils/update-flash-refs.js index 0d794d10b5..7b2b8e0e4a 100644 --- a/utils/update-flash-refs.js +++ b/utils/update-flash-refs.js @@ -191,7 +191,7 @@ function packageRefs(includes, output, license) { '\n'; }); var content = '', included = {}; - refs.split('\n').forEach(function (entry) { + refs.split(/\r\n|\r|\n/).forEach(function (entry) { if (entry.trim() === '') { return; } From a888c74c909a5978ca08e3c741016cb35b330e9d Mon Sep 17 00:00:00 2001 From: ExE Boss Date: Sun, 15 Apr 2018 14:45:00 +0200 Subject: [PATCH 2/2] Unprefix imageSmoothingEnabled --- src/gfx/2d/2d.ts | 4 ++-- src/gfx/references-base.ts | 1 - src/gfx/renderables/renderables.ts | 4 +--- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/gfx/2d/2d.ts b/src/gfx/2d/2d.ts index fadd0ef1a4..d5e5e4cebb 100644 --- a/src/gfx/2d/2d.ts +++ b/src/gfx/2d/2d.ts @@ -551,7 +551,7 @@ module Shumway.GFX.Canvas2D { var region = mipMapLevelSurfaceRegion.region; if (mipMapLevel) { var context = state.target.context; - context.imageSmoothingEnabled = context.mozImageSmoothingEnabled = true; + context.imageSmoothingEnabled = true; context.setTransform(matrix.a, matrix.b, matrix.c, matrix.d, matrix.tx, matrix.ty); context.drawImage ( mipMapLevelSurfaceRegion.surface.canvas, @@ -844,7 +844,7 @@ module Shumway.GFX.Canvas2D { this._frameInfo.shapes ++; - context.imageSmoothingEnabled = context.mozImageSmoothingEnabled = state.hasFlags(RenderFlags.ImageSmoothing); + context.imageSmoothingEnabled = state.hasFlags(RenderFlags.ImageSmoothing); var renderCount = node.properties["renderCount"] || 0; var cacheShapesMaxSize = this._options.cacheShapesMaxSize; diff --git a/src/gfx/references-base.ts b/src/gfx/references-base.ts index 739a4f84c7..24a901c69a 100644 --- a/src/gfx/references-base.ts +++ b/src/gfx/references-base.ts @@ -41,7 +41,6 @@ interface CanvasRenderingContext2D { stroke(path: Path2D): void; imageSmoothingEnabled: boolean - mozImageSmoothingEnabled: boolean fillRule: string; mozFillRule: string; diff --git a/src/gfx/renderables/renderables.ts b/src/gfx/renderables/renderables.ts index f365cf46aa..c7ba198d7c 100644 --- a/src/gfx/renderables/renderables.ts +++ b/src/gfx/renderables/renderables.ts @@ -725,9 +725,7 @@ module Shumway.GFX { enterTimeline("RenderableShape.render", this); for (var i = 0; i < paths.length; i++) { var path = paths[i]; - context['mozImageSmoothingEnabled'] = context.msImageSmoothingEnabled = - context['imageSmoothingEnabled'] = - path.smoothImage; + context.imageSmoothingEnabled = path.smoothImage; if (path.type === PathType.Fill) { if (clipPath) { clipPath.addPath(path.path, (context).currentTransform);