[Pkg-javascript-commits] [pdf.js] 78/139: Use 3 param method for converting r, g, b into css string.
David Prévot
taffit at moszumanska.debian.org
Fri Jan 9 21:18:29 UTC 2015
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch master
in repository pdf.js.
commit ceffeab1dee9c489787e93c9e777f0c85d666c17
Author: Fabian Lange <lange.fabian at gmail.com>
Date: Mon Oct 27 21:30:47 2014 +0100
Use 3 param method for converting r,g,b into css string.
This avoids creation of temporary arrays to pass them into the util
method. Also using "arguments" is more expensive then passing in 3
parameters.
---
src/core/pattern.js | 4 ++--
src/display/annotation_helper.js | 24 ++++++++++++------------
src/display/canvas.js | 4 ++--
src/display/pattern_helper.js | 2 +-
src/display/svg.js | 4 ++--
src/shared/util.js | 8 ++++----
6 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/src/core/pattern.js b/src/core/pattern.js
index 2bb9c72..6969e8c 100644
--- a/src/core/pattern.js
+++ b/src/core/pattern.js
@@ -146,14 +146,14 @@ Shadings.RadialAxial = (function RadialAxialClosure() {
ratio[0] = i;
fn(ratio, 0, color, 0);
rgbColor = cs.getRgb(color, 0);
- var cssColor = Util.makeCssRgb(rgbColor);
+ var cssColor = Util.makeCssRgb(rgbColor[0], rgbColor[1], rgbColor[2]);
colorStops.push([(i - t0) / diff, cssColor]);
}
var background = 'transparent';
if (dict.has('Background')) {
rgbColor = cs.getRgb(dict.get('Background'), 0);
- background = Util.makeCssRgb(rgbColor);
+ background = Util.makeCssRgb(rgbColor[0], rgbColor[1], rgbColor[2]);
}
if (!extendStart) {
diff --git a/src/display/annotation_helper.js b/src/display/annotation_helper.js
index 4502d95..0c01aa3 100644
--- a/src/display/annotation_helper.js
+++ b/src/display/annotation_helper.js
@@ -62,11 +62,9 @@ var AnnotationUtils = (function AnnotationUtilsClosure() {
container.style.backgroundColor = item.color;
var color = item.color;
- var rgb = [];
- for (var i = 0; i < 3; ++i) {
- rgb[i] = Math.round(color[i] * 255);
- }
- item.colorCssRgb = Util.makeCssRgb(rgb);
+ item.colorCssRgb = Util.makeCssRgb(Math.round(color[0] * 255),
+ Math.round(color[1] * 255),
+ Math.round(color[2] * 255));
var highlight = document.createElement('div');
highlight.className = 'annotationHighlight';
@@ -136,13 +134,15 @@ var AnnotationUtils = (function AnnotationUtilsClosure() {
var i, ii;
if (item.hasBgColor) {
var color = item.color;
- var rgb = [];
- for (i = 0; i < 3; ++i) {
- // Enlighten the color (70%)
- var c = Math.round(color[i] * 255);
- rgb[i] = Math.round((255 - c) * 0.7) + c;
- }
- content.style.backgroundColor = Util.makeCssRgb(rgb);
+
+ // Enlighten the color (70%)
+ var BACKGROUND_ENLIGHT = 0.7;
+ var r = BACKGROUND_ENLIGHT * (1.0 - color[0]) + color[0];
+ var g = BACKGROUND_ENLIGHT * (1.0 - color[1]) + color[1];
+ var b = BACKGROUND_ENLIGHT * (1.0 - color[2]) + color[2];
+ content.style.backgroundColor = Util.makeCssRgb((r * 255) | 0,
+ (g * 255) | 0,
+ (b * 255) | 0);
}
var title = document.createElement('h1');
diff --git a/src/display/canvas.js b/src/display/canvas.js
index 5f03e64..17b50bd 100644
--- a/src/display/canvas.js
+++ b/src/display/canvas.js
@@ -1551,12 +1551,12 @@ var CanvasGraphics = (function CanvasGraphicsClosure() {
this.current.fillColor = this.getColorN_Pattern(arguments);
},
setStrokeRGBColor: function CanvasGraphics_setStrokeRGBColor(r, g, b) {
- var color = Util.makeCssRgb(arguments);
+ var color = Util.makeCssRgb(r, g, b);
this.ctx.strokeStyle = color;
this.current.strokeColor = color;
},
setFillRGBColor: function CanvasGraphics_setFillRGBColor(r, g, b) {
- var color = Util.makeCssRgb(arguments);
+ var color = Util.makeCssRgb(r, g, b);
this.ctx.fillStyle = color;
this.current.fillColor = color;
},
diff --git a/src/display/pattern_helper.js b/src/display/pattern_helper.js
index f6305e6..e23dc0a 100644
--- a/src/display/pattern_helper.js
+++ b/src/display/pattern_helper.js
@@ -400,7 +400,7 @@ var TilingPattern = (function TilingPatternClosure() {
context.strokeStyle = ctx.strokeStyle;
break;
case PaintType.UNCOLORED:
- var cssColor = Util.makeCssRgb(color);
+ var cssColor = Util.makeCssRgb(color[0], color[1], color[2]);
context.fillStyle = cssColor;
context.strokeStyle = cssColor;
break;
diff --git a/src/display/svg.js b/src/display/svg.js
index 0a619df..97323bf 100644
--- a/src/display/svg.js
+++ b/src/display/svg.js
@@ -822,11 +822,11 @@ var SVGGraphics = (function SVGGraphicsClosure() {
this.current.miterLimit = limit;
},
setStrokeRGBColor: function SVGGraphics_setStrokeRGBColor(r, g, b) {
- var color = Util.makeCssRgb(arguments);
+ var color = Util.makeCssRgb(r, g, b);
this.current.strokeColor = color;
},
setFillRGBColor: function SVGGraphics_setFillRGBColor(r, g, b) {
- var color = Util.makeCssRgb(arguments);
+ var color = Util.makeCssRgb(r, g, b);
this.current.fillColor = color;
this.current.tspan = document.createElementNS(NS, 'svg:tspan');
this.current.xcoords = [];
diff --git a/src/shared/util.js b/src/shared/util.js
index 7deb991..767f727 100644
--- a/src/shared/util.js
+++ b/src/shared/util.js
@@ -574,10 +574,10 @@ var Util = PDFJS.Util = (function UtilClosure() {
// makeCssRgb() can be called thousands of times. Using |rgbBuf| avoids
// creating many intermediate strings.
- Util.makeCssRgb = function Util_makeCssRgb(rgb) {
- rgbBuf[1] = rgb[0];
- rgbBuf[3] = rgb[1];
- rgbBuf[5] = rgb[2];
+ Util.makeCssRgb = function Util_makeCssRgb(r, g, b) {
+ rgbBuf[1] = r;
+ rgbBuf[3] = g;
+ rgbBuf[5] = b;
return rgbBuf.join('');
};
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/pdf.js.git
More information about the Pkg-javascript-commits
mailing list