From: = <=>
Date: Tue, 4 Oct 2011 15:52:15 +0000 (-0700)
Subject: fix merge conflicts
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=8f571355138a4d905a75b1fc6d66f01506b6f7ab;p=pdf.js.git

fix merge conflicts
---

8f571355138a4d905a75b1fc6d66f01506b6f7ab
diff --cc fonts.js
index 1a58d4c,50dfa23..343583a
--- a/fonts.js
+++ b/fonts.js
@@@ -430,10 -428,10 +430,13 @@@ var Font = (function Font() 
        this.loading = false;
        return;
      }
 +    this.fontMatrix = properties.fontMatrix;
 +    if (properties.type == 'Type3')
 +      return;
  
+     // Trying to fix encoding using glyph widths and CIDSystemInfo.
+     this.fixWidths(properties);
+ 
      if (!file) {
        // The file data is not specified. Trying to fix the font name
        // to be used with the canvas.font.
diff --cc test/test_manifest.json
index b61e28d,a7f839c..3bf8df6
--- a/test/test_manifest.json
+++ b/test/test_manifest.json
@@@ -171,10 -171,10 +171,16 @@@
         "skipPages": [ 16 ],
         "type": "load"
      },
+     {  "id": "tcpdf_033",
+        "file": "pdfs/tcpdf_033.pdf",
+        "link": true,
+        "rounds": 1,
+        "type": "eq"
++    },
 +    {  "id": "simpletype3font",
 +       "file": "pdfs/simpletype3font.pdf",
 +       "link": false,
 +       "rounds": 1,
 +       "type": "load"
      }
  ]