From: Brendan Dahl <brendan.dahl@gmail.com>
Date: Tue, 22 Nov 2011 18:39:26 +0000 (-0800)
Subject: Merge upstream and change test pdf file.
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=faa202df1ece8519572d710dc4dbab2f5729d11e;p=pdf.js.git

Merge upstream and change test pdf file.
---

faa202df1ece8519572d710dc4dbab2f5729d11e
diff --cc test/pdfs/.gitignore
index 854612f,ac3dabb..a757acf
--- a/test/pdfs/.gitignore
+++ b/test/pdfs/.gitignore
@@@ -14,4 -14,5 +14,5 @@@
  !sizes.pdf
  !close-path-bug.pdf
  !alphatrans.pdf
+ !devicen.pdf
 -
 +!cmykjpeg.pdf
diff --cc test/pdfs/cmykjpeg.pdf
index 2f35ef7,0000000..8e3b85a
mode 100644,000000..100644
Binary files differ
diff --cc test/test_manifest.json
index 583e1cb,ee6e046..87af306
--- a/test/test_manifest.json
+++ b/test/test_manifest.json
@@@ -19,7 -19,7 +19,8 @@@
      },
      {  "id": "intelisa-load",
         "file": "pdfs/intelisa.pdf",
+        "md5": "f5712097d29287a97f1278839814f682",
 +       "md5": "f3ed5487d1afa34d8b77c0c734a95c79",
         "link": true,
         "rounds": 1,
         "type": "load"
@@@ -262,11 -269,11 +263,18 @@@
         "rounds": 1,
         "type": "eq"
      },
+     {  "id": "devicen",
+        "file": "pdfs/devicen.pdf",
+        "md5": "aac6a91725435d1376c6ff492dc5cb75",
+        "link": false,
+        "rounds": 1,
+        "type": "eq"
++    },
 +    {  "id": "cmykjpeg",
 +       "file": "pdfs/cmykjpeg.pdf",
-        "md5": "8307472972ba962d86d2f60d2ced9a97",
++       "md5": "85d162b48ce98503a382d96f574f70a2",
 +       "link": false,
 +       "rounds": 1,
 +       "type": "eq"
      }
  ]