Merge pull request mozilla#1992 from brendandahl/indexedcs-data-clone

yurydelendik · yurydelendik · commit d38781d72e09 · 2012-08-16T15:50:16.000-07:00
Stop streams from being sent from worker for indexed color spaces.
diff --git a/src/colorspace.js b/src/colorspace.js
@@ -139,6 +139,9 @@ var ColorSpace = (function ColorSpaceClosure() {
           var baseIndexedCS = ColorSpace.parseToIR(cs[1], xref, res);
           var hiVal = cs[2] + 1;
           var lookup = xref.fetchIfRef(cs[3]);
+          if (isStream(lookup)) {
+            lookup = lookup.getBytes();
+          }
           return ['IndexedCS', baseIndexedCS, hiVal, lookup];
         case 'Separation':
         case 'DeviceN':
@@ -260,14 +263,18 @@ var IndexedCS = (function IndexedCSClosure() {
 
     var baseNumComps = base.numComps;
     var length = baseNumComps * highVal;
-    var lookupArray = new Uint8Array(length);
+    var lookupArray;
 
     if (isStream(lookup)) {
+      lookupArray = new Uint8Array(length);
       var bytes = lookup.getBytes(length);
       lookupArray.set(bytes);
     } else if (isString(lookup)) {
+      lookupArray = new Uint8Array(length);
       for (var i = 0; i < length; ++i)
         lookupArray[i] = lookup.charCodeAt(i);
+    } else if (lookup instanceof Uint8Array) {
+      lookupArray = lookup;
     } else {
       error('Unrecognized lookup table: ' + lookup);
     }
diff --git a/test/pdfs/issue1985.pdf b/test/pdfs/issue1985.pdf
diff --git a/test/test_manifest.json b/test/test_manifest.json
@@ -658,5 +658,11 @@
       "pageLimit": 1,
       "link": true,
       "type": "load"
+    },
+    {  "id": "issue1985",
+      "file": "pdfs/issue1985.pdf",
+      "md5": "2ac7c68e26a8ef797aead15e4875cc6d",
+      "rounds": 1,
+      "type": "load"
     }
 ]

Original file line number	Diff line number	Diff line change
`@@ -658,5 +658,11 @@`
`658`	`658`	`"pageLimit": 1,`
`659`	`659`	`"link": true,`
`660`	`660`	`"type": "load"`
	`661`	`+ },`
	`662`	`+ { "id": "issue1985",`
	`663`	`+ "file": "pdfs/issue1985.pdf",`
	`664`	`+ "md5": "2ac7c68e26a8ef797aead15e4875cc6d",`
	`665`	`+ "rounds": 1,`
	`666`	`+ "type": "load"`
`661`	`667`	`}`
`662`	`668`	`]`