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

use dict.get2 to lookup with a key that has an abbreviation (i.e. BitsPerComponent/BPC)

Browse Source
This commit is contained in:
Andreas Gal 2011-06-06 21:34:21 -07:00
parent 99aacfe42c
commit 5c5d09c898
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pdf.js
View File

@ -510,6 +510,9 @@ var Dict = (function() {
get: function(key) { get: function(key) {
return this.map[key]; return this.map[key];
}, },
get2: function(key1, key2) {
return this.get(key1) || this.get(key2);
},
has: function(key) { has: function(key) {
return key in this.map; return key in this.map;
}, },
@ -1027,8 +1030,8 @@ var Parser = (function() {
return this.filter(stream, dict); return this.filter(stream, dict);
}, },
filter: function(stream, dict) { filter: function(stream, dict) {
var filter = dict.get("Filter") || dict.get("F"); var filter = dict.get2("Filter", "F");
var params = dict.get("DecodeParms") || dict.get("DP"); var params = dict.get2("DecodeParms", "DP");
if (IsName(filter)) if (IsName(filter))
return this.makeFilter(stream, filter.name, params); return this.makeFilter(stream, filter.name, params);
if (IsArray(filter)) { if (IsArray(filter)) {
@ -1890,16 +1893,16 @@ var CanvasGraphics = (function() {
// TODO cache rendered images? // TODO cache rendered images?
var dict = image.dict; var dict = image.dict;
var w = dict.get("Width") || dict.get("W"); var w = dict.get2("Width", "W");
var h = dict.get("Height") || dict.get("H"); var h = dict.get2("Height", "H");
if (w < 1 || h < 1) if (w < 1 || h < 1)
error("Invalid image width or height"); error("Invalid image width or height");
var interpolate = dict.get("Interpolate") || dict.get("I"); var interpolate = dict.get2("Interpolate", "I");
if (!IsBool(interpolate)) if (!IsBool(interpolate))
interpolate = false; interpolate = false;
var imageMask = dict.get("ImageMask") || dict.get("IM"); var imageMask = dict.get2("ImageMask", "IM");
if (!IsBool(imageMask)) if (!IsBool(imageMask))
imageMask = false; imageMask = false;
@ -1909,7 +1912,7 @@ var CanvasGraphics = (function() {
var csMode = image.csMode; var csMode = image.csMode;
if (!bitsPerComponent) { if (!bitsPerComponent) {
bitsPerComponent = dict.get("BitsPerComponent") || dict.get("BPC"); bitsPerComponent = dict.get("BitsPerComponent", "BPC");
if (!bitsPerComponent) { if (!bitsPerComponent) {
if (imageMask) if (imageMask)
bitsPerComponent = 1; bitsPerComponent = 1;
@ -1938,7 +1941,7 @@ var CanvasGraphics = (function() {
var smaskDict = smask.dict; var smaskDict = smask.dict;
if (!smaskDict) if (!smaskDict)
error("No dictionary for smask"); error("No dictionary for smask");
var smaskBitsPerComponent = smaskDict.get("BitsPerComponent") || smaskDict.get("BPC"); var smaskBitsPerComponent = smaskDict.get2("BitsPerComponent", "BPC");
if (!smaskBitsPerComponent) if (!smaskBitsPerComponent)
error("Bad BPC for smask"); error("Bad BPC for smask");
var max = (1 << bitsPerComponent) - 1; var max = (1 << bitsPerComponent) - 1;