From: Vivien Nicolas <21@vingtetun.org>
Date: Mon, 29 Aug 2011 22:56:20 +0000 (+0200)
Subject: Merge remote branch 'upstream/master'
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=b4f3ceef858768862088d00747d3b32ef6f49527;p=pdf.js.git

Merge remote branch 'upstream/master'
---

b4f3ceef858768862088d00747d3b32ef6f49527
diff --cc pdf.js
index 32e1381,201744e..597e8b2
--- a/pdf.js
+++ b/pdf.js
@@@ -4379,9 -4396,10 +4379,9 @@@ var PartialEvaluator = (function() 
        }
  
        var descriptor = xref.fetch(fd);
 -
        var fontName = fontDict.get('Name');
        if (!fontName)
-         fontName = xref.fetchIfRef(descriptor.get('FontName'));;
+         fontName = xref.fetchIfRef(descriptor.get('FontName'));
        assertWellFormed(IsName(fontName), 'invalid font name');
        fontName = fontName.name.replace(/[\+,\-]/g, '_');