Removed unnecessary usage of Compat.

Author: sambitdash

src/CDObject.jl

@@ -8,7 +8,7 @@ using TimeZones
 PDF files support the string format: (D:YYYYMMDDHHmmSSOHH'mm)
 
 """
-@compat struct CDDate
+struct CDDate
     d::ZonedDateTime
     CDDate(d::ZonedDateTime) = new(d)
 end
@@ -30,7 +30,7 @@ end
 
 Base.show(io::IO, dt::CDDate) = show(io, dt.d)
 
-@compat struct CDRect{T <: Number}
+struct CDRect{T <: Number}
     llx::T
     lly::T
     urx::T

src/CosDoc.jl

@@ -8,9 +8,9 @@ export CosDoc,
        cosDocGetRoot,
        cosDocGetObject
 
-@compat abstract type CosDoc end
+abstract type CosDoc end
 
-@compat mutable struct CosDocImpl <: CosDoc
+mutable struct CosDocImpl <: CosDoc
   filepath::String
   size::Int
   io::IOStream

src/CosObject.jl

@@ -4,29 +4,29 @@ export CosDict, CosString, CosNumeric, CosBoolean, CosTrue, CosFalse,
        CosObject, CosNull, CosNullType,CosFloat, CosInt, CosArray, CosName,
        CosDict, CosIndirectObjectRef, CosStream, get, set!
 
-@compat abstract type CosObject end
+abstract type CosObject end
 
 @inline get{T<:CosObject}(o::T)=o.val
 
-@compat abstract type CosString <: CosObject end
-@compat abstract type CosNumeric <: CosObject end
+abstract type CosString <: CosObject end
+abstract type CosNumeric <: CosObject end
 
-@compat struct CosBoolean <: CosObject
+struct CosBoolean <: CosObject
     val::Bool
 end
 
 const CosTrue=CosBoolean(true)
 const CosFalse=CosBoolean(false)
 
-@compat struct CosNullType <: CosObject end
+struct CosNullType <: CosObject end
 
 const CosNull=CosNullType()
 
-@compat struct CosFloat <: CosNumeric
+struct CosFloat <: CosNumeric
     val::Float64
 end
 
-@compat struct CosInt <: CosNumeric
+struct CosInt <: CosNumeric
     val::Int
 end
 
@@ -35,40 +35,37 @@ A parsed data structure to ensure the object information is stored as an object.
 This has no meaning without a associated CosDoc. When a reference object is hit
 the object should be searched from the CosDoc and returned.
 """
-@compat struct CosIndirectObjectRef <: CosObject
+struct CosIndirectObjectRef <: CosObject
   val::Tuple{Int,Int}
   CosIndirectObjectRef(num::Int, gen::Int)=new((num,gen))
 end
 
-#hash(o::CosIndirectObjectRef, h::UInt=zero(UInt)) = hash(o.val, h)
-#isequal(r1::CosIndirectObjectRef, r2::CosIndirectObjectRef) = isequal(r1.val, r2.val)
-
-@compat mutable struct CosIndirectObject{T <: CosObject} <: CosObject
+mutable struct CosIndirectObject{T <: CosObject} <: CosObject
   num::Int
   gen::Int
   obj::T
 end
 
 get(o::CosIndirectObject) = get(o.obj)
 
-@compat struct CosName <: CosObject
+struct CosName <: CosObject
     val::Symbol
     CosName(str::String)=new(Symbol("CosName_",str))
 end
 
-@compat struct CosXString <: CosString
+struct CosXString <: CosString
   val::Vector{UInt8}
   CosXString(arr::Vector{UInt8})=new(arr)
 end
 
-@compat struct CosLiteralString <: CosString
+struct CosLiteralString <: CosString
     val::Vector{UInt8}
     CosLiteralString(arr::Vector{UInt8})=new(arr)
 end
 
 CosLiteralString(str::AbstractString)=CosLiteralString(transcode(UInt8,str))
 
-@compat mutable struct CosArray <: CosObject
+mutable struct CosArray <: CosObject
     val::Array{CosObject,1}
     function CosArray(arr::Array{T,1} where {T<:CosObject})
       val = Array{CosObject,1}()
@@ -83,7 +80,7 @@ end
 get(o::CosArray, isNative=false)=isNative ? map((x)->get(x),o.val) : o.val
 length(o::CosArray)=length(o.val)
 
-@compat mutable struct CosDict <: CosObject
+mutable struct CosDict <: CosObject
     val::Dict{CosName,CosObject}
     CosDict()=new(Dict{CosName,CosObject}())
 end
@@ -107,7 +104,7 @@ end
 set!(o::CosIndirectObject{CosDict}, name::CosName, obj::CosObject) =
             set!(o.obj, name, obj)
 
-@compat mutable struct CosStream <: CosObject
+mutable struct CosStream <: CosObject
     extent::CosDict
     isInternal::Bool
     CosStream(d::CosDict,isInternal::Bool=true)=new(d,isInternal)
@@ -128,7 +125,7 @@ Decodes the stream and provides output as an BufferedInputStream.
 """
 get(stm::CosStream) = decode(stm)
 
-@compat mutable struct CosObjectStream <: CosObject
+mutable struct CosObjectStream <: CosObject
   stm::CosStream
   n::Int
   first::Int
@@ -161,7 +158,7 @@ set!(os::CosIndirectObject{CosObjectStream}, name::CosName, obj::CosObject)=
 
 get(os::CosObjectStream) = get(os.stm)
 
-@compat mutable struct CosXRefStream<: CosObject
+mutable struct CosXRefStream<: CosObject
   stm::CosStream
   isDecoded::Bool
   function CosXRefStream(s::CosStream,isDecoded::Bool=false)
@@ -181,6 +178,64 @@ set!(os::CosIndirectObject{CosXRefStream}, name::CosName, obj::CosObject)=
 
 get(os::CosXRefStream) = get(os.stm)
 
+"""
+Can be a Number Tree or a Name Tree.
+
+`kids`: is `null` in case of a leaf node
+`range`: is `null` in case of a root node
+`values`: is `null` in case of an intermediate node
+
+Intent: faster loookup without needing to load the complete tree structure. Hence, the tree
+will not be loaded on full scan.
+"""
+mutable struct CosTreeNode{K}
+    values::Nullable{Vector{Pair{K,CosObject}}}
+    kids::Nullable{Vector{CosIndirectObjectRef}}
+    range::Nullable{Pair{K,K}}
+end
+
+function createTreeNode(dict::CosObject)
+    range = get(dict, CosName("Limits"))
+    kids  = get(dict, CosName("Kids"))
+    names = get(dict, CosName("Names"))
+    nums  = get(dict, CosName("Nums"))
+
+
+end
+
+#=
+function find_tree{S}(search_fn::Function, doc::CosDoc, root::CosObject, term::S)
+end
+
+function find{K}(fn::Function, doc::CosDoc, node::CosTreeNode{K}, key::K)
+    inrange = 0
+    if (!isnull(node.range))
+        inrange = (key < node.range[1]) ? -1 :
+                  (key > node.range[2]) ?  1 : 0
+    end
+    if inrange == 0
+        if isnull(node.kids) # This is the leaf
+            # TBD: look into the values.
+            return (found, fn(key, node.values))
+        end
+        for kid in kids
+            kidobj = cosDocGetObject(doc, kid)
+            kidnode = CosTreeNode(kidobj)
+            inrange, val = find(fn, doc, kidnode, key)
+            if inrange == -1
+                break
+            elseif inrange == 0
+                return (inrange,val)
+            end
+        end
+    else
+        return (inrange, nothing)
+    end
+    return (inrange, nothing)
+end
+
+=#
+
 # All show methods
 
 show(io::IO, o::CosObject) = print(io, o.val)

src/CosReader.jl

@@ -285,7 +285,7 @@ function read_internal_stream_data(ps::BufferedInputStream, extent::CosDict, len
 end
 
 
-@compat mutable struct CosObjectLoc
+mutable struct CosObjectLoc
   loc::Int
   stm::CosObject
   obj::CosObject

src/CosStream.jl

@@ -114,7 +114,7 @@ function decode_filter(io, filters::CosArray, parms::CosObject)
   return bufstm
 end
 
-@compat mutable struct PNGPredictorSource{T<:BufferedInputStream}
+mutable struct PNGPredictorSource{T<:BufferedInputStream}
   input::T
   predictor::UInt8
   columns::Int
@@ -265,7 +265,7 @@ function load_png_row!(source::PNGPredictorSource)
   return source
 end
 
-@compat mutable struct RLEDecodeSource{T<:BufferedInputStream}
+mutable struct RLEDecodeSource{T<:BufferedInputStream}
   input::T
   run::Vector{UInt8}
   s::UInt8
@@ -354,7 +354,7 @@ function decode_rle(input::BufferedInputStream)
   return BufferedInputStream(RLEDecodeSource(input))
 end
 
-@compat mutable struct ASCIIHexDecodeSource{T<:BufferedInputStream}
+mutable struct ASCIIHexDecodeSource{T<:BufferedInputStream}
   input::T
   isClosed::Bool
 end
@@ -389,7 +389,7 @@ function BufferedStreams.readbytes!{T<:BufferedInputStream}(
   nbreturn = ndata / 2
 
   i = j = 0
-  c = n = UInt(0) # Ensuring computation at the word boundary. 
+  c = n = UInt(0) # Ensuring computation at the word boundary.
   while i < nbreturn
     n = 0
     c = data[i+=1]
@@ -413,7 +413,7 @@ end
 
 #This is still buggy. Needs to be worked upon.
 
-@compat mutable struct ASCII85DecodeSource{T<:BufferedInputStream}
+mutable struct ASCII85DecodeSource{T<:BufferedInputStream}
   input::T
   residue::Vector{UInt8}
   isEOF::Bool

src/PDDoc.jl

@@ -2,14 +2,15 @@ export PDDoc,
        pdDocOpen,
        pdDocClose,
        pdDocGetCatalog,
+       pdDocGetNamesDict,
        pdDocGetInfo,
        pdDocGetCosDoc,
        pdDocGetPageCount,
        pdDocGetPage
 
 using ..Common
 
-@compat abstract type PDDoc end
+abstract type PDDoc end
 
 function pdDocOpen(fp::String)
   doc = PDDocImpl(fp)
@@ -44,15 +45,21 @@ function pdDocGetInfo(doc::PDDoc)
     ref = get(doc.cosDoc.trailer[1], CosName("Info"))
     obj = cosDocGetObject(doc.cosDoc, ref)
     dInfo = Dict{CDTextString, Union{CDTextString, CDDate}}()
-    for (index, data) in enumerate(get(obj))
-        skey = CDTextString(data[1])
+    for (key, val) in get(obj)
+        skey = CDTextString(key)
         dInfo[skey] = (skey == "CreationDate") || (skey == "ModDate") ?
-                      CDDate(data[2]) : CDTextString(data[2])
+                      CDDate(val) : CDTextString(val)
     end
     return dInfo
 end
 
-@compat mutable struct PDDocImpl <: PDDoc
+function pdDocGetNamesDict(doc::PDDoc)
+    catalog = pdDocGetCatalog(doc)
+    ref = get(catalog, CosName("Names"))
+    obj = cosDocGetObject(doc.cosDoc, ref)
+end
+
+mutable struct PDDocImpl <: PDDoc
   cosDoc::CosDoc
   catalog::CosObject
   pages::CosObject

src/PDPage.jl

@@ -4,9 +4,9 @@ export PDPage,
        pdPageGetCosObject,
        pdPageGetContentObjects
 
-@compat abstract type PDPage end
+abstract type PDPage end
 
-@compat mutable struct PDPageImpl <: PDPage
+mutable struct PDPageImpl <: PDPage
   doc::PDDocImpl
   cospage::CosObject
   contents::CosObject

src/PDPageElement.jl

@@ -1,15 +1,15 @@
 using BufferedStreams
 import Base: show
 
-@compat abstract type PDPageObject end
+abstract type PDPageObject end
 
 """
 *PDPageElement* type is a representation of organization of content and content
 operators.
 
 The operands are like attributes of the element to be used for any operations.
 """
-@compat mutable struct PDPageElement <: PDPageObject
+mutable struct PDPageElement <: PDPageObject
   t::Symbol
   version::Tuple{Int,Int}
   noperand::Int
@@ -29,7 +29,7 @@ function show(io::IO, e::PDPageElement)
   print(io, String(e.t))
 end
 
-@compat mutable struct PDPageObjectGroup <: PDPageObject
+mutable struct PDPageObjectGroup <: PDPageObject
   isEOG::Bool
   objs::Vector{Union{PDPageObject,CosObject}}
   PDPageObjectGroup(isEOG::Bool=false)=
@@ -76,24 +76,24 @@ function collect_object(grp::PDPageObjectGroup,
   return elem
 end
 
-@compat mutable struct PDPageTextObject <: PDPageObject
+mutable struct PDPageTextObject <: PDPageObject
   group::PDPageObjectGroup
   PDPageTextObject()=new(PDPageObjectGroup())
 end
 
-@compat mutable struct PDPageMarkedContent <: PDPageObject
+mutable struct PDPageMarkedContent <: PDPageObject
   group::PDPageObjectGroup
   PDPageMarkedContent()=new(PDPageObjectGroup())
 end
 
-@compat mutable struct PDPageInlineImage <: PDPageObject
+mutable struct PDPageInlineImage <: PDPageObject
   params::CosDict
   data::Vector{UInt8}
   isRead::Bool
   PDPageInlineImage()=new(CosDict(),Vector{UInt8}(),false)
 end
 
-@compat mutable struct PDPage_BeginInlineImage <: PDPageObject
+mutable struct PDPage_BeginInlineImage <: PDPageObject
   elem::PDPageElement
   PDPage_BeginInlineImage(ts::AbstractString,ver::Tuple{Int,Int},nop)=
     new(PDPageElement(ts,ver,nop))
@@ -149,14 +149,14 @@ function collect_inline_image(img::PDPageInlineImage, elem::PDPageElement,
 end
 
 
-@compat mutable struct PDPage_BeginGroup <: PDPageObject
+mutable struct PDPage_BeginGroup <: PDPageObject
   elem::PDPageElement
   objT::Type
   PDPage_BeginGroup(ts::AbstractString,ver::Tuple{Int,Int},nop,t::Type)=
     new(PDPageElement(ts,ver,nop),t)
 end
 
-@compat mutable struct PDPage_EndGroup
+mutable struct PDPage_EndGroup
   elem::PDPageElement
   PDPage_EndGroup(ts::AbstractString,ver::Tuple{Int,Int},nop)=
     new(PDPageElement(ts,ver,nop))