Add missing resolve for font obj and make sure image objs ids are strings as well

diff --git a/fonts.js b/fonts.js
index 3fce351a0354ae3b8c1b3d54971c0aa8ff4d00f1..da8082fc55aaec5709b2109dd94c98165ee887aa 100755 (executable)
--- a/fonts.js
+++ b/fonts.js
@@ -217,6 +217,7 @@ var FontLoader = {
         if (fontObj.loading) {
           return false;
         }
+        Objects.resolve(fontObj.loadedName);
       }
 
       document.documentElement.removeEventListener(

diff --git a/pdf.js b/pdf.js
index bd9a9f7b2d607871ba8b7c2ae9d33197363e9c8f..42f272e6844cff12edd104a5c897882e8898a4ff 100644 (file)
--- a/pdf.js
+++ b/pdf.js
@@ -4183,7 +4183,7 @@ var PartialEvaluator = (function() {
         var h = dict.get('Height', 'H');
 
         if (image instanceof JpegStream) {
-          var objId = ++objIdCounter;
+          var objId = 'img_' + ++objIdCounter;
           handler.send("obj", [objId, "JpegStream", image.getIR()]);
 
           // Add the dependency on the image object.

diff --git a/worker.js b/worker.js
index 9364a82786316cd1bb7107560799df79a7bb168a..b7347050b03a0f12af3e22478c16acfe31aba09c 100644 (file)
--- a/worker.js
+++ b/worker.js
@@ -261,6 +261,7 @@ var WorkerPDFDoc = (function() {
         case "JpegStream":
           var IR = data[2];
           new JpegStreamIR(objId, IR);
+          console.log('got image');
         break;
         case "Font":
           var name = data[2];