Fixing windows failure. CMap stream now closed.

Author: sambitdash

src/PDFonts.jl

@@ -101,8 +101,13 @@ end
 
 function merge_encoding!(fum::FontUnicodeMapping, cmap::CosIndirectObject{CosStream},
                          doc::CosDoc, font::CosObject)
-    fum.cmap = read_cmap(get(cmap))
-    fum.hasCMap = true
+    stm_cmap = get(cmap)
+    try
+        fum.cmap = read_cmap(stm_cmap)
+        fum.hasCMap = true
+    finally
+        close(stm_cmap)
+    end
     return fum
 end
 

src/PDPage.jl

@@ -124,22 +124,22 @@ function get_page_contents(page::PDPage, contents::CosObject)
 end
 
 function load_page_objects(page::PDPageImpl)
-  stm = pdPageGetContents(page)
-  if (isnull(page.content_objects))
-    page.content_objects=Nullable(PDPageObjectGroup())
-  end
-  load_page_objects(page, stm)
+    contents = pdPageGetContents(page)
+    if (isnull(page.content_objects))
+        page.content_objects=Nullable(PDPageObjectGroup())
+    end
+    load_page_objects(page, contents)
 end
 
 load_page_objects(page::PDPageImpl, stm::CosNullType) = nothing
 
 function load_page_objects(page::PDPageImpl, stm::CosObject)
-  bufstm = decode(stm)
-  try
-    load_objects(get(page.content_objects), bufstm)
-  finally
-    close(bufstm)
-  end
+    bufstm = decode(stm)
+    try
+        load_objects(get(page.content_objects), bufstm)
+    finally
+        close(bufstm)
+    end
 end
 
 function load_page_objects(page::PDPageImpl, stm::CosArray)

test/debugIO.jl

@@ -72,9 +72,9 @@ end
 end
 
 function files_equal(f1, f2)
-    io1 = open(f1); io2 = open(f2)
+    io1 = util_open(f1, "r"); io2 = util_open(f2, "r")
     buf1 = read(io1); buf2 = read(io2)
-    close(io1); close(io2)
+    util_close(io1); util_close(io2)
     return buf1 == buf2
 end