Adding Converts for CosString

Author: sambitdash

src/CosDoc.jl

@@ -178,7 +178,7 @@ attach_object(doc::CosDocImpl, indstm::CosIndirectObject{CosStream})=
 
 function attach_object(doc::CosDocImpl, stm::CosStream)
   tmpfile = get(get(stm,  CosName("F")))
-  push!(doc.tmpfiles, tmpfile)
+  push!(doc.tmpfiles, String(tmpfile))
   return nothing
 end
 

src/CosObjStream.jl

@@ -92,7 +92,7 @@ end
 function read_object_info_from_stm(stm::CosStream,
   oids::Vector{Int}, oloc::Vector{Int}, n::Int, first::Int)
   filename = get(stm, CosName("F"))
-  io = util_open(filename |> get,"r")
+  io = util_open(String(filename),"r")
   try
     for i = 1:n
       val = readuntil(io, ' ')
@@ -123,7 +123,7 @@ end
 function cosObjectStreamGetObject(stm::CosObjectStream,
   ref::CosNullType, loc::Int)
   filename = get(stm, CosName("F"))
-  io = util_open(filename |> get,"r")
+  io = util_open(String(filename),"r")
   ps = BufferedInputStream(io)
   try
     seek(ps, stm.oloc[loc+1])

src/CosObject.jl

@@ -57,15 +57,28 @@ get(o::CosIndirectObject) = get(o.obj)
 end
 
 @compat struct CosXString <: CosString
-    val::String
-    CosXString(str::String)=new(str)
+  val::Vector{UInt8}
+  CosXString(arr::Vector{UInt8})=new(arr)
 end
 
+Base.convert(::Type{Vector{UInt8}}, xstr::CosXString)=
+  (xstr.val |> String |> hex2bytes)
+
+Base.convert(::Type{String}, xstr::CosXString)=
+  String(convert(Vector{UInt8},xstr))
+
+
 @compat struct CosLiteralString <: CosString
-    val::String
-    CosLiteralString(str::String)=new(str)
+    val::Vector{UInt8}
+    CosLiteralString(arr::Vector{UInt8})=new(arr)
 end
 
+CosLiteralString(str::AbstractString)=CosLiteralString(transcode(UInt8,str))
+
+Base.convert(::Type{Vector{UInt8}}, str::CosLiteralString)=str.val
+
+Base.convert(::Type{String}, str::CosLiteralString)=String(str.val)
+
 @compat mutable struct CosArray <: CosObject
     val::Array{CosObject,1}
     function CosArray(arr::Array{T,1} where {T<:CosObject})

src/CosReader.jl

@@ -173,7 +173,7 @@ function parse_string(ps::BufferedInputStream)
         paren_cnt-=1
       else
         chomp_space!(ps)
-        return CosLiteralString(String(b))
+        return CosLiteralString(b)
       end
     end
     push!(b, c)
@@ -196,7 +196,7 @@ function parse_xstring(ps::BufferedInputStream)
                 push!(b, NULL)
             end
             chomp_space!(ps)
-            return CosXString(String(b))
+            return CosXString(b)
         elseif !ispdfxdigit(c)
             _error(E_UNEXPECTED_CHAR, ps)
         else

src/CosStream.jl

@@ -77,7 +77,7 @@ function cosStreamRemoveFilters(stm::CosObject)
     data = read(bufstm)
     close(bufstm)
     filename = get(stm, CosName("F"))
-    write(filename |> get, data)
+    write(filename |> get |> String, data)
     set!(stm, CosName("FFilter"),CosNull)
   end
   return stm
@@ -92,7 +92,7 @@ function decode(stm::CosObject)
   filters = get(stm, CosName("FFilter"))
   parms = get(stm, CosName("FDecodeParms"))
 
-  io = (util_open(filename |> get, "r") |> BufferedInputStream)
+  io = (util_open(String(filename), "r") |> BufferedInputStream)
 
   return decode_filter(io, filters, parms)
 end