fix merge conflicts

diff --cc fonts.js
index 1a58d4c6c321a13753b5b82bddd20be6613edc10,50dfa2337f9b8e45fa11d92a649486122e9b8452..343583acd66b1c5c9e837cb5d0e99a4b2f8a22f9
--- 1/fonts.js
--- 2/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 pdf.js
Simple merge

diff --cc test/test_manifest.json
index b61e28dbc20843304c20e51f0189fb245d4c910b,a7f839c7b9b2a6e2f6daf5c24458f4bfa41e2cd3..3bf8df6a06e44116fcf06566c6081be2ceb7281d
--- 1/test/test_manifest.json
--- 2/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"
      }
  ]