Sakurai/pdf.js
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Address Yury's review comments + remove call to addCtxCurrentTransform in pattern.js as the contet is added during the CanvasGraphics constructor already

Browse Source
This commit is contained in:
Julian Viereck 2011-11-27 09:22:08 +01:00
parent a30f0ff848
commit 36e618c373
2 changed files with 23 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/canvas.js
View File

@ -59,7 +59,7 @@ function ScratchCanvas(width, height) {
return canvas; return canvas;
} }
function addCtxCurrentTransform(ctx) { function addContextCurrentTransform(ctx) {
// If the context doesn't expose a `mozCurrentTransform`, add a JS based on. // If the context doesn't expose a `mozCurrentTransform`, add a JS based on.
if (!ctx.mozCurrentTransform) { if (!ctx.mozCurrentTransform) {
// Store the original context // Store the original context
@ -73,12 +73,14 @@ function addCtxCurrentTransform(ctx) {
ctx._transformMatrix = [1, 0, 0, 1, 0, 0]; ctx._transformMatrix = [1, 0, 0, 1, 0, 0];
ctx._transformStack = []; ctx._transformStack = [];
ctx.__defineGetter__('mozCurrentTransform', function getCurrentTransform() { Object.defineProperty(ctx, 'mozCurrentTransform', {
return this._transformMatrix; get: function getCurrentTransform() {
return this._transformMatrix;
}
}); });
ctx.__defineGetter__('mozCurrentTransformInverse', Object.defineProperty(ctx, 'mozCurrentTransformInverse', {
function getCurrentTransformInverse() { get: function getCurrentTransformInverse() {
// Calculation done using WolframAlpha: // Calculation done using WolframAlpha:
// http://www.wolframalpha.com/input/? // http://www.wolframalpha.com/input/?
// i=Inverse+{{a%2C+c%2C+e}%2C+{b%2C+d%2C+f}%2C+{0%2C+0%2C+1}} // i=Inverse+{{a%2C+c%2C+e}%2C+{b%2C+d%2C+f}%2C+{0%2C+0%2C+1}}
@ -86,16 +88,19 @@ function addCtxCurrentTransform(ctx) {
var m = this._transformMatrix; var m = this._transformMatrix;
var a = m[0], b = m[1], c = m[2], d = m[3], e = m[4], f = m[5]; var a = m[0], b = m[1], c = m[2], d = m[3], e = m[4], f = m[5];
var ad_bc = a * d - b * c;
var bc_ad = b * c - a * d;
return [ return [
d / (a * d - b * c), d / ad_bc,
b / (b * c - a * d), b / bc_ad,
c / (b * c - a * d), c / bc_ad,
a / (a * d - b * c), a / ad_bc,
(d * e - c * f) / (b * c - a * d), (d * e - c * f) / bc_ad,
(b * e - a * f) / (a * d - b * c) (b * e - a * f) / ad_bc
]; ];
} }
); });
ctx.save = function ctxSave() { ctx.save = function ctxSave() {
var old = this._transformMatrix; var old = this._transformMatrix;
@ -111,7 +116,7 @@ function addCtxCurrentTransform(ctx) {
this._transformMatrix = prev; this._transformMatrix = prev;
this._originalRestore(); this._originalRestore();
} }
} };
ctx.translate = function ctxTranslate(x, y) { ctx.translate = function ctxTranslate(x, y) {
var m = this._transformMatrix; var m = this._transformMatrix;
@ -119,7 +124,7 @@ function addCtxCurrentTransform(ctx) {
m[5] = m[1] * x + m[3] * y + m[5]; m[5] = m[1] * x + m[3] * y + m[5];
this._originalTranslate(x, y); this._originalTranslate(x, y);
} };
ctx.scale = function ctxScale(x, y) { ctx.scale = function ctxScale(x, y) {
var m = this._transformMatrix; var m = this._transformMatrix;
@ -129,7 +134,7 @@ function addCtxCurrentTransform(ctx) {
m[3] = m[3] * y; m[3] = m[3] * y;
this._originalScale(x, y); this._originalScale(x, y);
} };
ctx.transform = function ctxTransform(a, b, c, d, e, f) { ctx.transform = function ctxTransform(a, b, c, d, e, f) {
var m = this._transformMatrix; var m = this._transformMatrix;
@ -143,7 +148,7 @@ function addCtxCurrentTransform(ctx) {
]; ];
ctx._originalTransform(a, b, c, d, e, f); ctx._originalTransform(a, b, c, d, e, f);
} };
ctx.rotate = function ctxRotate(angle) { ctx.rotate = function ctxRotate(angle) {
var cosValue = Math.cos(angle); var cosValue = Math.cos(angle);
@ -160,7 +165,7 @@ function addCtxCurrentTransform(ctx) {
]; ];
this._originalRotate(angle); this._originalRotate(angle);
} };
} }
} }
@ -184,7 +189,7 @@ var CanvasGraphics = (function canvasGraphics() {
this.objs = objs; this.objs = objs;
if (canvasCtx) { if (canvasCtx) {
addCtxCurrentTransform(canvasCtx); addContextCurrentTransform(canvasCtx);
} }
} }

2
src/pattern.js
View File

@ -217,8 +217,6 @@ var TilingPattern = (function tilingPattern() {
// set the new canvas element context as the graphics context // set the new canvas element context as the graphics context
var tmpCtx = tmpCanvas.getContext('2d'); var tmpCtx = tmpCanvas.getContext('2d');
addCtxCurrentTransform(tmpCtx);
var graphics = new CanvasGraphics(tmpCtx, objs); var graphics = new CanvasGraphics(tmpCtx, objs);
switch (paintType) { switch (paintType) {