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

[Cleanup] Rename Raw to IR

Browse Source
This commit is contained in:
Julian Viereck 2011-09-07 16:09:49 -07:00
parent e7fa637bf4
commit f369bd3ed0
1 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
pdf.js
View File

@ -4267,7 +4267,7 @@ var PartialEvaluator = (function() {
var shading = xref.fetchIfRef(dict.get('Shading')); var shading = xref.fetchIfRef(dict.get('Shading'));
var matrix = dict.get('Matrix'); var matrix = dict.get('Matrix');
var pattern = Pattern.parseShading(shading, matrix, xref, res, null /*ctx*/); var pattern = Pattern.parseShading(shading, matrix, xref, res, null /*ctx*/);
args = pattern.getPatternRaw(); args = pattern.getIR();
} else { } else {
error("Unkown PatternType " + typeNum); error("Unkown PatternType " + typeNum);
} }
@ -4391,7 +4391,7 @@ var PartialEvaluator = (function() {
// Parse the ColorSpace data to a raw format. // Parse the ColorSpace data to a raw format.
case "setFillColorSpace": case "setFillColorSpace":
case "setStrokeColorSpace": case "setStrokeColorSpace":
args = [ ColorSpace.parseRaw(args[0], xref, resources) ]; args = [ ColorSpace.parseToIR(args[0], xref, resources) ];
break; break;
case "shadingFill": case "shadingFill":
var shadingRes = xref.fetchIfRef(res.get('Shading')); var shadingRes = xref.fetchIfRef(res.get('Shading'));
@ -4403,7 +4403,7 @@ var PartialEvaluator = (function() {
error('No shading object found'); error('No shading object found');
var shadingFill = Pattern.parseShading(shading, null, xref, res, /* ctx */ null); var shadingFill = Pattern.parseShading(shading, null, xref, res, /* ctx */ null);
var patternIR = shadingFill.getPatternRaw(); var patternIR = shadingFill.getIR();
args = [ patternIR ]; args = [ patternIR ];
fn = "shadingFill"; fn = "shadingFill";
@ -5284,13 +5284,11 @@ var CanvasGraphics = (function() {
// Color // Color
setStrokeColorSpace: function(raw) { setStrokeColorSpace: function(raw) {
this.current.strokeColorSpace = this.current.strokeColorSpace =
ColorSpace.fromRaw(raw); ColorSpace.fromIR(raw);
// ColorSpace.parse(space, this.xref, this.res);
}, },
setFillColorSpace: function(raw) { setFillColorSpace: function(raw) {
this.current.fillColorSpace = this.current.fillColorSpace =
ColorSpace.fromRaw(raw); ColorSpace.fromIR(raw);
// ColorSpace.parse(space, this.xref, this.res);
}, },
setStrokeColor: function(/*...*/) { setStrokeColor: function(/*...*/) {
var cs = this.current.strokeColorSpace; var cs = this.current.strokeColorSpace;
@ -5316,7 +5314,7 @@ var CanvasGraphics = (function() {
// Build the pattern based on the IR data. // Build the pattern based on the IR data.
var pattern = new TilingPatternIR(IR, color, this.ctx); var pattern = new TilingPatternIR(IR, color, this.ctx);
} else if (IR[0] == "RadialAxialShading") { } else if (IR[0] == "RadialAxialShading") {
var pattern = Pattern.shadingFromRaw(this.ctx, IR); var pattern = Pattern.shadingFromIR(this.ctx, IR);
} else { } else {
throw "Unkown IR type"; throw "Unkown IR type";
} }
@ -5376,7 +5374,7 @@ var CanvasGraphics = (function() {
var ctx = this.ctx; var ctx = this.ctx;
this.save(); this.save();
ctx.fillStyle = Pattern.shadingFromRaw(ctx, patternIR); ctx.fillStyle = Pattern.shadingFromIR(ctx, patternIR);
var inv = ctx.mozCurrentTransformInverse; var inv = ctx.mozCurrentTransformInverse;
if (inv) { if (inv) {
@ -5715,7 +5713,7 @@ var ColorSpace = (function() {
return null; return null;
}; };
constructor.fromRaw = function(raw) { constructor.fromIR = function(raw) {
var name; var name;
if (IsArray(raw)) { if (IsArray(raw)) {
name = raw[0]; name = raw[0];
@ -5737,7 +5735,7 @@ var ColorSpace = (function() {
} }
} }
constructor.parseRaw = function colorspace_parse(cs, xref, res) { constructor.parseToIR = function colorspace_parse(cs, xref, res) {
if (IsName(cs)) { if (IsName(cs)) {
var colorSpaces = res.get('ColorSpace'); var colorSpaces = res.get('ColorSpace');
if (IsDict(colorSpaces)) { if (IsDict(colorSpaces)) {
@ -6089,10 +6087,10 @@ var Pattern = (function() {
} }
}; };
constructor.shadingFromRaw = function(ctx, raw) { constructor.shadingFromIR = function(ctx, raw) {
var obj = window[raw[0]]; var obj = window[raw[0]];
return obj.fromRaw(ctx, raw); return obj.fromIR(ctx, raw);
} }
constructor.parse = function pattern_parse(args, cs, xref, res, ctx) { constructor.parse = function pattern_parse(args, cs, xref, res, ctx) {
@ -6222,7 +6220,7 @@ var RadialAxialShading = (function() {
this.colorStops = colorStops; this.colorStops = colorStops;
} }
constructor.fromRaw = function(ctx, raw) { constructor.fromIR = function(ctx, raw) {
var type = raw[1]; var type = raw[1];
var colorStops = raw[2]; var colorStops = raw[2];
var p0 = raw[3]; var p0 = raw[3];
@ -6301,7 +6299,7 @@ var RadialAxialShading = (function() {
return grad; return grad;
}, },
getPatternRaw: function() { getIR: function() {
var coordsArr = this.coordsArr; var coordsArr = this.coordsArr;
var type = this.shadingType; var type = this.shadingType;
if (type == 2) { if (type == 2) {