pdf-reader 0.7.5 → 0.7.6

data/CHANGELOG

@@ -1,3 +1,14 @@
+v0.7.6 (28th August 2009)
+- Various bug fixes that increase the files we can successfully parse
+  - Treat float and integer tokens differently (thanks Neil)
+  - Correctly handle PDFs where the Kids element of a Pages dict is an indirect
+    reference (thanks Rob Holland)
+  - Fix conversion of PDF strings to Ruby strings on 1.8.6 (thanks Andrès Koetsier)
+  - Fix decoding with ASCII85 and ASCIIHex filters (thanks Andrès Koetsier)
+  - Fix extracting inline images from content streams (thanks Andrès Koetsier)
+  - Fix extracting [ ] from content streams (thanks Christian Rishøj)
+  - Fix conversion of text to UTF8 when the cmap uses bfrange (thanks Federico Gonzalez Lutteroth)
+
 v0.7.5 (27th August 2008)
 - Fix a 1.8.7ism
 

data/MIT-LICENSE

@@ -0,0 +1,21 @@
+Copyright (c) 2009 Peter Jones
+Copyright (c) 2009 James Healy
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.rdoc

@@ -5,9 +5,22 @@ It provides programmatic access to the contents of a PDF file with a high
 degree of flexibility.
 
 The PDF 1.7 specification is a weighty document and not all aspects are
-currently supported. We welcome submission of PDF files that exhibit
+currently supported. I welcome submission of PDF files that exhibit
 unsupported aspects of the spec to assist with improving out support.
 
+= Development Status
+
+I adopted this library in 2007 when I was learning the fundamentals of the PDF
+spec. I do not currently use it in my day to day work and I just don't have the
+spare time to dedicate to adding new features.
+
+The code as it is works fairly well, and I offer it "as is". All patches, bug
+reports and sample PDFs are welcome - I will work on them when I can. If anyone
+is interested in adding features to PDF::Reader in their own effort to learn
+the PDF file format, I'll happy offer help qand support.
+
+I STRONGLY RECOMMEND NOT USING PDF::READER FOR YOUR PRODUCTION CODE.
+
 = Installation
 
 The recommended installation method is via Rubygems.
@@ -42,7 +55,8 @@ PDF file:
 
 MalformedPDFError - The PDF appears to be corrupt in some way. If you believe the
 file should be valid, or that a corrupt file didn't raise an exception, please
-forward a copy of the file to the maintainers and we can attempt improve the code.
+forward a copy of the file to the maintainers (preferably via the google group)
+and we can attempt to improve the code.
 
 UnsupportedFeatureError - The PDF uses a feature that PDF::Reader doesn't currently
 support. Again, we welcome submissions of PDF files that exhibit these features to help
@@ -56,12 +70,18 @@ report it!) or your receiver (please don't report it!).
 
 = Maintainers
 
-- Peter Jones <mailto:pjones@pmade.com>
 - James Healy <mailto:jimmy@deefa.com>
 
+= Licensing
+
+This library is distributed under the terms of the MIT License. See the included file for
+more detail.
+
 = Mailing List
 
-Any questions or feedback should be sent to the PDF::Reader google group.
+Any questions or feedback should be sent to the PDF::Reader google group. It's
+better that any answers be available for others instead of hiding in someone's
+inbox.
 
 http://groups.google.com/group/pdf-reader
 
@@ -77,21 +97,21 @@ A simple app to count the number of pages in a PDF File.
   require 'pdf/reader'
 
   class PageReceiver
-    attr_accessor :page_count
+    attr_accessor :counter
 
     def initialize
-      @page_count = 0
+      @counter = 0
     end
 
     # Called when page parsing ends
     def end_page
-      @page_count += 1
+      @counter += 1
     end
   end
 
   receiver = PageReceiver.new
   pdf = PDF::Reader.file("somefile.pdf", receiver)
-  puts "#{receiver.page_count} pages"
+  puts "#{receiver.counter} pages"
 
 == List all callbacks generated by a single PDF
 
@@ -242,7 +262,7 @@ A simple app to display the number of pages in a PDF File.
 
 = Known Limitations
 
-The order of the callbacks is unpredicable, and is dependent on the internal
+The order of the callbacks is unpredictable, and is dependent on the internal
 layout of the file, not the order objects are displayed to the user. As a
 consequence of this it is highly unlikely that text will be completely in
 order.

data/Rakefile

@@ -6,7 +6,7 @@ require 'rake/testtask'
 require "rake/gempackagetask"
 require 'spec/rake/spectask'
 
-PKG_VERSION = "0.7.5"
+PKG_VERSION = "0.7.6"
 PKG_NAME = "pdf-reader"
 PKG_FILE_NAME = "#{PKG_NAME}-#{PKG_VERSION}"
 
@@ -47,8 +47,7 @@ Rake::RDocTask.new("doc") do |rdoc|
   rdoc.rdoc_files.include('README.rdoc')
   rdoc.rdoc_files.include('TODO')
   rdoc.rdoc_files.include('CHANGELOG')
-  #rdoc.rdoc_files.include('COPYING')
-  #rdoc.rdoc_files.include('LICENSE')
+  rdoc.rdoc_files.include('MIT-LICENSE')
   rdoc.rdoc_files.include('lib/**/*.rb')
   rdoc.options << "--inline-source"
 end
@@ -70,7 +69,7 @@ spec = Gem::Specification.new do |spec|
   spec.executables << "pdf_text"
   spec.executables << "pdf_list_callbacks"
 	spec.has_rdoc = true
-	spec.extra_rdoc_files = %w{README.rdoc TODO CHANGELOG}
+	spec.extra_rdoc_files = %w{README.rdoc TODO CHANGELOG MIT-LICENSE }
 	spec.rdoc_options << '--title' << 'PDF::Reader Documentation' <<
 	                     '--main'  << 'README.rdoc' << '-q'
   spec.author = "Peter Jones"
@@ -78,6 +77,7 @@ spec = Gem::Specification.new do |spec|
 	spec.rubyforge_project = "pdf-reader"
 	spec.homepage = "http://software.pmade.com/pdfreader"
 	spec.description = "The PDF::Reader library implements a PDF parser conforming as much as possible to the PDF specification from Adobe"
+  spec.add_dependency('Ascii85', '>=0.9')
 end
 
 # package the library into a gem

data/bin/pdf_list_callbacks

@@ -1,5 +1,7 @@
 #!/usr/bin/env ruby
 
+require 'rubygems'
+
 $LOAD_PATH.unshift(File.dirname(__FILE__) + "/../lib")
 
 require 'pdf/reader'

data/bin/pdf_object

@@ -1,5 +1,7 @@
 #!/usr/bin/env ruby
 
+require 'rubygems'
+
 $LOAD_PATH.unshift(File.dirname(__FILE__) + "/../lib")
 
 USAGE = "USAGE: " + File.basename(__FILE__) + " <file> <object id> [generation]"

data/bin/pdf_text

@@ -1,5 +1,6 @@
 #!/usr/bin/env ruby
 
+require 'rubygems'
 $LOAD_PATH.unshift(File.dirname(__FILE__) + "/../lib")
 
 require 'pdf/reader'

data/lib/pdf/reader.rb

@@ -24,6 +24,7 @@
 ################################################################################
 
 require 'stringio'
+require 'ascii85'
 
 module PDF
   ################################################################################

data/lib/pdf/reader/buffer.rb

@@ -9,10 +9,10 @@
 # distribute, sublicense, and/or sell copies of the Software, and to
 # permit persons to whom the Software is furnished to do so, subject to
 # the following conditions:
-# 
+#
 # The above copyright notice and this permission notice shall be
 # included in all copies or substantial portions of the Software.
-# 
+#
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
 # EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
 # MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
@@ -41,7 +41,7 @@ class PDF::Reader
       self
     end
     ################################################################################
-    # reads the requested number of bytes from the underlying IO stream. 
+    # reads the requested number of bytes from the underlying IO stream.
     #
     # length should be a positive integer.
     def read (length)
@@ -56,13 +56,22 @@ class PDF::Reader
       out
     end
     ################################################################################
-    # Reads from the buffer until the specified token is found, or the end of the buffer 
+    # Reads from the buffer until the specified token is found, or the end of the buffer
     #
     # bytes - the bytes to search for.
     def read_until(bytes)
       out = ""
       size = bytes.size
-       
+
+      if @buffer && !@buffer.empty?
+        if @buffer.include?(bytes)
+          offset = @buffer.index(bytes) + size
+          return head(offset)
+        else
+          out << head(@buffer.size)
+        end
+      end
+
       loop do
         out << @io.read(1)
         if out[-1 * size,size].eql?(bytes)
@@ -74,7 +83,7 @@ class PDF::Reader
       out
     end
     ################################################################################
-    # returns true if the underlying IO object is at end and the internal buffer 
+    # returns true if the underlying IO object is at end and the internal buffer
     # is empty
     def eof?
       ready_token
@@ -89,6 +98,10 @@ class PDF::Reader
       @io.pos
     end
     ################################################################################
+    def pos_without_buf
+      @io.pos - @buffer.to_s.size
+    end
+    ################################################################################
     # PDF files are processed by tokenising the content into a series of objects and commands.
     # This prepares the buffer for use by reading the next line of tokens into memory.
     def ready_token (with_strip=true, skip_blanks=true)
@@ -105,10 +118,10 @@ class PDF::Reader
     # return the next token from the underlying IO stream
     def token
       ready_token
-      
+
       i = @buffer.index(/[\[\]()<>{}\s\/]/) || @buffer.size
 
-      token_chars = 
+      token_chars =
         if i == 0 and @buffer[i,2] == "<<"    then 2
         elsif i == 0 and @buffer[i,2] == ">>" then 2
         elsif i == 0                          then 1
@@ -148,7 +161,7 @@ class PDF::Reader
       data = @io.read(1024)
 
       # the PDF 1.7 spec (section #3.4) says that EOL markers can be either \r, \n, or both.
-      # To ensure we find the xref offset correctly, change all possible options to a 
+      # To ensure we find the xref offset correctly, change all possible options to a
       # standard format
       data = data.gsub("\r\n","\n").gsub("\n\r","\n").gsub("\r","\n")
       lines = data.split(/\n/).reverse

data/lib/pdf/reader/cmap.rb

@@ -69,14 +69,12 @@ class PDF::Reader
         start_code = "0x#{start_code}".hex
         end_code   = "0x#{end_code}".hex
         dst        = "0x#{dst}".hex
-        incr       = 0
 
         # add all values in the range to our mapping
-        (start_code..end_code).each do |val|
-          @map[val] = dst + incr
-          incr += 1
+        (start_code..end_code).each_with_index do |val, idx|
+          @map[val] = dst + idx
           # ensure a single range does not exceed 255 chars
-          raise PDF::Reader::MalformedPDFError, "a CMap bfrange cann't exceed 255 chars" if incr > 255
+          raise PDF::Reader::MalformedPDFError, "a CMap bfrange cann't exceed 255 chars" if idx > 255
         end
       end
     end

data/lib/pdf/reader/content.rb

@@ -293,7 +293,7 @@ class PDF::Reader
       if page[:Type] == :Pages
         callback(:begin_page_container, [page])
         walk_resources(@xref.object(res)) if res
-        page[:Kids].each {|child| walk_pages(@xref.object(child))}
+        @xref.object(page[:Kids]).each {|child| walk_pages(@xref.object(child))}
         callback(:end_page_container)
       elsif page[:Type] == :Page
         callback(:begin_page, [page])

data/lib/pdf/reader/encoding.rb

@@ -41,33 +41,33 @@ class PDF::Reader
       end
 
       case enc
-        when nil                   then 
+        when nil                   then
           load_mapping File.dirname(__FILE__) + "/encodings/standard.txt"
           @unpack = "C*"
-        when "Identity-H".to_sym   then 
+        when "Identity-H".to_sym   then
           @unpack = "n*"
           @to_unicode_required = true
-        when :MacRomanEncoding     then 
+        when :MacRomanEncoding     then
           load_mapping File.dirname(__FILE__) + "/encodings/mac_roman.txt"
           @unpack = "C*"
-        when :MacExpertEncoding    then 
+        when :MacExpertEncoding    then
           load_mapping File.dirname(__FILE__) + "/encodings/mac_expert.txt"
           @unpack = "C*"
-        when :PDFDocEncoding       then 
+        when :PDFDocEncoding       then
           load_mapping File.dirname(__FILE__) + "/encodings/pdf_doc.txt"
           @unpack = "C*"
-        when :StandardEncoding     then 
+        when :StandardEncoding     then
           load_mapping File.dirname(__FILE__) + "/encodings/standard.txt"
           @unpack = "C*"
-        when :SymbolEncoding       then 
+        when :SymbolEncoding       then
           load_mapping File.dirname(__FILE__) + "/encodings/symbol.txt"
           @unpack = "C*"
-        when :UTF16Encoding        then 
+        when :UTF16Encoding        then
           @unpack = "n*"
-        when :WinAnsiEncoding      then 
+        when :WinAnsiEncoding      then
           load_mapping File.dirname(__FILE__) + "/encodings/win_ansi.txt"
           @unpack = "C*"
-        when :ZapfDingbatsEncoding then 
+        when :ZapfDingbatsEncoding then
           load_mapping File.dirname(__FILE__) + "/encodings/zapf_dingbats.txt"
           @unpack = "C*"
         else raise UnsupportedFeatureError, "#{enc} is not currently a supported encoding"

data/lib/pdf/reader/error.rb

@@ -9,10 +9,10 @@
 # distribute, sublicense, and/or sell copies of the Software, and to
 # permit persons to whom the Software is furnished to do so, subject to
 # the following conditions:
-# 
+#
 # The above copyright notice and this permission notice shall be
 # included in all copies or substantial portions of the Software.
-# 
+#
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
 # EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
 # MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

data/lib/pdf/reader/explore.rb

@@ -9,10 +9,10 @@
 # distribute, sublicense, and/or sell copies of the Software, and to
 # permit persons to whom the Software is furnished to do so, subject to
 # the following conditions:
-# 
+#
 # The above copyright notice and this permission notice shall be
 # included in all copies or substantial portions of the Software.
-# 
+#
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
 # EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
 # MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
@@ -46,7 +46,7 @@ class PDF::Reader
     def output_parent (obj)
       case obj
       when Hash
-        obj.each do |k,v| 
+        obj.each do |k,v|
           print "#{k}"; output_child(v); print "\n"
           Explore::const_set(k, k) if !Explore.const_defined?(k)
         end

data/lib/pdf/reader/filter.rb

@@ -9,10 +9,10 @@
 # distribute, sublicense, and/or sell copies of the Software, and to
 # permit persons to whom the Software is furnished to do so, subject to
 # the following conditions:
-# 
+#
 # The above copyright notice and this permission notice shall be
 # included in all copies or substantial portions of the Software.
-# 
+#
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
 # EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
 # MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
@@ -34,17 +34,30 @@ class PDF::Reader
   # in the future.
   class Filter
     ################################################################################
-    # creates a new filter for decoding content
-    def initialize (name, options)
+    # creates a new filter for decoding content.
+    #
+    # Filters that are only used to encode image data are accepted, but the data is
+    # returned untouched. At this stage PDF::Reader has no need to decode images.
+    #
+    def initialize (name, options = nil)
       @options = options
 
       case name.to_sym
+      when :ASCII85Decode  then @filter = :ascii85
+      when :ASCIIHexDecode then @filter = :asciihex
+      when :CCITTFaxDecode then @filter = nil
+      when :DCTDecode      then @filter = nil
       when :FlateDecode    then @filter = :flate
-      #else                raise UnsupportedFeatureError, "Unknown filter: #{name}"
+      when :JBIG2Decode    then @filter = nil
+      else                 raise UnsupportedFeatureError, "Unknown filter: #{name}"
       end
     end
     ################################################################################
     # attempts to decode the specified data with the current filter
+    #
+    # Filters that are only used to encode image data are accepted, but the data is
+    # returned untouched. At this stage PDF::Reader has no need to decode images.
+    #
     def filter (data)
       # leave the data untouched if we don't support the required filter
       return data if @filter.nil?
@@ -53,6 +66,30 @@ class PDF::Reader
       self.send(@filter, data)
     end
     ################################################################################
+    # Decode the specified data using the Ascii85 algorithm. Relies on the AScii85
+    # rubygem.
+    #
+    def ascii85(data)
+      data = "<~#{data}" unless data.to_s[0,2] == "<~"
+      Ascii85::decode(data)
+    rescue Exception => e
+      # Oops, there was a problem decoding the stream
+      raise MalformedPDFError, "Error occured while decoding an ASCII85 stream (#{e.class.to_s}: #{e.to_s})"
+    end
+    ################################################################################
+    # Decode the specified data using the AsciiHex algorithm.
+    #
+    def asciihex(data)
+      data.chop! if data[-1,1] == ">"
+      data = data[1,data.size] if data[0,1] == "<"
+      data.gsub!(/[^A-Fa-f0-9]/,"")
+      data << "0" if data.size % 2 == 1
+      data.scan(/.{2}/).map { |s| s.hex.chr }.join("")
+    rescue Exception => e
+      # Oops, there was a problem decoding the stream
+      raise MalformedPDFError, "Error occured while decoding an ASCIIHex stream (#{e.class.to_s}: #{e.to_s})"
+    end
+    ################################################################################
     # Decode the specified data with the Zlib compression algorithm
     def flate (data)
       begin
@@ -63,7 +100,7 @@ class PDF::Reader
         # If that fails, then use an undocumented 'feature' to attempt to inflate
         # the data as a raw RFC1951 stream.
         #
-        # See 
+        # See
         # - http://blade.nagaokaut.ac.jp/cgi-bin/scat.rb/ruby/ruby-talk/243545
         # - http://www.gzip.org/zlib/zlib_faq.html#faq38
         Zlib::Inflate.new(-Zlib::MAX_WBITS).inflate(data)

data/lib/pdf/reader/font.rb

@@ -9,10 +9,10 @@
 # distribute, sublicense, and/or sell copies of the Software, and to
 # permit persons to whom the Software is furnished to do so, subject to
 # the following conditions:
-# 
+#
 # The above copyright notice and this permission notice shall be
 # included in all copies or substantial portions of the Software.
-# 
+#
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
 # EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
 # MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
@@ -28,12 +28,12 @@ class PDF::Reader
     attr_accessor :label, :subtype, :encoding, :descendantfonts, :tounicode
     attr_reader :basefont
 
-    # returns a hash that maps glyph names to unicode codepoints. The mapping is based on 
+    # returns a hash that maps glyph names to unicode codepoints. The mapping is based on
     # a text file supplied by Adobe at:
     # http://www.adobe.com/devnet/opentype/archives/glyphlist.txt
     def self.glyphnames
       @@glyphs ||= {}
-      
+
       if @@glyphs.empty?
         RUBY_VERSION >= "1.9" ? mode = "r:BINARY" : mode = "r"
         File.open(File.dirname(__FILE__) + "/glyphlist.txt",mode) do |f|
@@ -51,9 +51,9 @@ class PDF::Reader
       # setup a default encoding for the selected font. It can always be overridden
       # with encoding= if required
       case font
-      when "Symbol" then 
+      when "Symbol" then
         self.encoding = PDF::Reader::Encoding.new("SymbolEncoding")
-      when "ZapfDingbats" then 
+      when "ZapfDingbats" then
         self.encoding = PDF::Reader::Encoding.new("ZapfDingbatsEncoding")
       end
       @basefont = font
@@ -64,7 +64,7 @@ class PDF::Reader
 
       if params.class == String
         # translate the bytestram into a UTF-8 string.
-        # If an encoding hasn't been specified, assume the text using this 
+        # If an encoding hasn't been specified, assume the text using this
         # font is in Adobe Standard Encoding.
         (encoding || PDF::Reader::Encoding.new(:StandardEncoding)).to_utf8(params, tounicode)
       elsif params.class == Array

data/lib/pdf/reader/parser.rb

@@ -61,7 +61,8 @@ class PDF::Reader
       when ">>", "]", ">"             then return Token.new(token)
       else
         if operators.has_key?(token)  then return Token.new(token)
-        else                          return token.to_f
+        elsif token =~ /\d*\.\d/      then return token.to_f
+        else                          return token.to_i
         end
       end
     end
@@ -99,7 +100,7 @@ class PDF::Reader
     # Reads a PDF hex string from the buffer and converts it to a Ruby String
     def hex_string
       str = ""
-      
+
       loop do
         token = @buffer.token
         break if token == ">"
@@ -122,14 +123,15 @@ class PDF::Reader
         # find the first occurance of ( ) [ \ or ]
         #
         # I originally just used the regexp form of index(), but it seems to be
-        # buggy on some OSX systems (returns nil when there is a match). The
-        # block form of index() is more reliable, but only works on 1.8.7 or
-        # greater.
+        # buggy on some OSX systems (returns nil when there is a match). This
+        # version is more reliable and was suggested by Andrès Koetsier.
         #
-        if RUBY_VERSION >= "1.8.7"
-          i = @buffer.raw.unpack("C*").index { |n| [40, 41, 91, 92, 93].include?(n) }
-        else
-          i = @buffer.raw.index(/[\\\(\)]/)
+        i = nil
+        @buffer.raw.unpack("C*").each_with_index do |charint, idx|
+          if [40, 41, 92].include?(charint)
+            i = idx
+            break
+          end
         end
 
         if i.nil?
@@ -201,7 +203,7 @@ class PDF::Reader
     def stream (dict)
       raise MalformedPDFError, "PDF malformed, missing stream length" unless dict.has_key?(:Length)
       data = @buffer.read(@xref.object(dict[:Length]))
-      
+
       Error.str_assert(parse_token, "endstream")
       Error.str_assert(parse_token, "endobj")
 

data/lib/pdf/reader/reference.rb

@@ -9,10 +9,10 @@
 # distribute, sublicense, and/or sell copies of the Software, and to
 # permit persons to whom the Software is furnished to do so, subject to
 # the following conditions:
-# 
+#
 # The above copyright notice and this permission notice shall be
 # included in all copies or substantial portions of the Software.
-# 
+#
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
 # EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
 # MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
@@ -25,7 +25,7 @@
 
 class PDF::Reader
   ################################################################################
-  # An internal PDF::Reader class that represents an indirect reference to a PDF Object 
+  # An internal PDF::Reader class that represents an indirect reference to a PDF Object
   class Reference
     ################################################################################
     # check if the next token in the buffer is a reference, and return a PDF::Reader::Reference

data/lib/pdf/reader/stream.rb

@@ -9,10 +9,10 @@
 # distribute, sublicense, and/or sell copies of the Software, and to
 # permit persons to whom the Software is furnished to do so, subject to
 # the following conditions:
-# 
+#
 # The above copyright notice and this permission notice shall be
 # included in all copies or substantial portions of the Software.
-# 
+#
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
 # EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
 # MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

data/lib/pdf/reader/token.rb

@@ -9,10 +9,10 @@
 # distribute, sublicense, and/or sell copies of the Software, and to
 # permit persons to whom the Software is furnished to do so, subject to
 # the following conditions:
-# 
+#
 # The above copyright notice and this permission notice shall be
 # included in all copies or substantial portions of the Software.
-# 
+#
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
 # EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
 # MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

data/lib/pdf/reader/xref.rb

@@ -72,7 +72,7 @@ class PDF::Reader
     # If the object is a stream, that is returned as well
     def object (ref, save_pos = true)
       return ref unless ref.kind_of?(Reference)
-      pos = @buffer.pos if save_pos
+      pos = @buffer.pos_without_buf if save_pos
       obj = Parser.new(@buffer.seek(offset_for(ref)), self).object(ref.id, ref.gen)
       @buffer.seek(pos) if save_pos
       return obj
@@ -132,7 +132,7 @@ class PDF::Reader
     # ref - a PDF::Reader::Reference object containing an object ID and revision number
     def offset_for (ref)
       @xref[ref.id][ref.gen]
-    rescue 
+    rescue
       raise InvalidObjectError, "Object #{ref.id}, Generation #{ref.gen} is invalid"
     end
     ################################################################################

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: pdf-reader
 version: !ruby/object:Gem::Version 
-  version: 0.7.5
+  version: 0.7.6
 platform: ruby
 authors: 
 - Peter Jones
@@ -9,10 +9,19 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-08-27 00:00:00 +10:00
+date: 2009-08-28 00:00:00 +10:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: Ascii85
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0.9"
+    version: 
 description: The PDF::Reader library implements a PDF parser conforming as much as possible to the PDF specification from Adobe
 email: pjones@pmade.com
 executables: 
@@ -25,10 +34,9 @@ extra_rdoc_files:
 - README.rdoc
 - TODO
 - CHANGELOG
+- MIT-LICENSE
 files: 
-- lib/pdf
 - lib/pdf/reader.rb
-- lib/pdf/reader
 - lib/pdf/reader/buffer.rb
 - lib/pdf/reader/cmap.rb
 - lib/pdf/reader/content.rb
@@ -44,7 +52,6 @@ files:
 - lib/pdf/reader/register_receiver.rb
 - lib/pdf/reader/text_receiver.rb
 - lib/pdf/reader/token.rb
-- lib/pdf/reader/encodings
 - lib/pdf/reader/encodings/mac_expert.txt
 - lib/pdf/reader/encodings/mac_roman.txt
 - lib/pdf/reader/encodings/pdf_doc.txt
@@ -58,8 +65,11 @@ files:
 - README.rdoc
 - TODO
 - CHANGELOG
+- MIT-LICENSE
 has_rdoc: true
 homepage: http://software.pmade.com/pdfreader
+licenses: []
+
 post_install_message: 
 rdoc_options: 
 - --title
@@ -84,9 +94,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: pdf-reader
-rubygems_version: 1.2.0
+rubygems_version: 1.3.4
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: A library for accessing the content of PDF files
 test_files: []