origami 1.2.1 → 1.2.2

data/{origami → lib/origami}/graphics/state.rb

@@ -69,9 +69,9 @@ module Origami
         @line_join = LineJoinStyle::MITER_JOIN
         @miter_limit = 10.0
         @dash_pattern = DashPattern.new([], 0)
-        @rendering_intent = RenderingIntent::RELATIVE_COLORIMETRIC
+        @rendering_intent = Color::Intent::RELATIVE
         @stroke_adjustment = false
-        @blend_mode = BlendMode::NORMAL
+        @blend_mode = Color::BlendMode::NORMAL
         @soft_mask = :None
         @alpha_constant = 1.0
         @alpha_source = false

data/{origami → lib/origami}/graphics/xobject.rb

@@ -492,6 +492,225 @@ module Origami
       field   :Measure,           :Type => Dictionary, :Version => "1.7", :ExtensionLevel => 3
       field   :PtData,            :Type => Dictionary, :Version => "1.7", :ExtensionLevel => 3
 
+      #
+      # Converts an ImageXObject stream into an image file data.
+      # Output format depends on the stream encoding: 
+      #   * JPEG for DCTDecode
+      #   * JPEG2000 for JPXDecode
+      #   * JBIG2 for JBIG2Decode
+      #   * PNG for everything else
+      #
+      #   Returns an array of the form [ _format_, _data_ ]
+      #
+      def to_image_file
+        encoding = self.Filter
+        encoding = encoding[0] if encoding.is_a? ::Array
+
+        case (encoding && encoding.value)
+          when :DCTDecode then [ 'jpg', self.data ]
+          when :JBIG2Decode then [ 'jbig2', self.data ]
+          when :JPXDecode then [ 'jp2', self.data ]
+
+        else
+          raise InvalidColorError, "No colorspace specified" unless self.ColorSpace
+
+          case cs = self.ColorSpace.value
+            when Color::Space::DEVICE_GRAY
+              colortype = 0
+              components = 1
+            when Color::Space::DEVICE_RGB
+              colortype = 2
+              components = 3
+            when ::Array
+              cstype = cs[0].is_a?(Reference) ? cs[0].solve : cs[0]
+              case cstype.value
+                when :Indexed
+                  colortype = 3
+                  components = 3
+                  csbase = cs[1].is_a?(Reference) ? cs[1].solve : cs[1]
+                  lookup = cs[3].is_a?(Reference) ? cs[3].solve : cs[3]
+
+                when :ICCBased
+                  iccprofile = cs[1].is_a?(Reference) ? cs[1].solve : cs[1]
+                  raise InvalidColorError, 
+                    "Invalid ICC Profile parameter" unless iccprofile.is_a?(Stream)
+                  
+                  case iccprofile.N
+                    when 1
+                      colortype = 0
+                      components = 1
+                    when 3
+                      colortype = 2
+                      components = 3
+                  else
+                    raise InvalidColorError,
+                      "Invalid number of components in ICC profile: #{iccprofile.N}"
+                  end
+              else
+                raise InvalidColorError, "Unsupported color space: #{self.ColorSpace}"
+              end
+          else
+            raise InvalidColorError, "Unsupported color space: #{self.ColorSpace}"
+          end
+
+          bpc = self.BitsPerComponent || 8
+          w,h = self.Width, self.Height
+          pixels = self.data
+          
+          hdr = [137, 80, 78, 71, 13, 10, 26, 10].pack('C*')
+          chunks = []
+
+          chunks <<
+          [
+            'IHDR',
+            [
+              w, h,
+              bpc, colortype, 0, 0, 0
+            ].pack("N2C5")
+          ]
+
+
+          if self.Intents
+            intents =
+              case self.Intents.value
+                when Intents::PERCEPTUAL then 0
+                when Intents::RELATIVE then 1
+                when Intents::SATURATION then 2
+                when Intents::ABSOLUTE then 3
+              else
+                3
+              end
+
+            chunks <<
+            [
+              'sRGB',
+              [ intents ].pack('C')
+            ]
+
+            chunks << [ 'gAMA', [ 45455 ].pack("N") ]
+            chunks << 
+            [ 
+              'cHRM', 
+              [ 
+                31270,
+                32900,
+                64000,
+                33000,
+                30000,
+                60000,
+                15000,
+                6000
+              ].pack("N8") 
+            ]
+          end
+
+          if colortype == 3
+            lookup =
+              case lookup
+                when Stream then lookup.data
+                when String then lookup.value
+              else 
+                raise InvalidColorError, "Invalid indexed palette table"
+              end
+
+            raise InvalidColorError, "Invalid base color space" unless csbase
+            palette = ""
+
+            case csbase.value
+              when Color::Space::DEVICE_GRAY
+                lookup.each_byte do |g|
+                  palette << Color.gray_to_rgb(g).pack("C3")
+                end              
+              when Color::Space::DEVICE_RGB
+                palette << lookup[0, (lookup.size / 3) * 3]
+              when Color::Space::DEVICE_CMYK
+                (lookup.size / 4).times do |i|
+                  cmyk = lookup[i * 4, 4].unpack("C4").map!{|c| c.to_f / 255}
+                  palette << Color.cmyk_to_rgb(*cmyk).map!{|c| (c * 255).to_i}.pack("C3")
+                end
+              when ::Array
+                case csbase[0].solve.value
+                  when :ICCBased
+                    iccprofile = csbase[1].solve
+                    raise InvalidColorError, 
+                      "Invalid ICC Profile parameter" unless iccprofile.is_a?(Stream)
+                    
+                    case iccprofile.N
+                      when 1
+                        lookup.each_byte do |g|
+                          palette << Color.gray_to_rgb(g).pack("C3")
+                        end
+                      when 3
+                        palette << lookup[0, (lookup.size / 3) * 3]
+                    else
+                      raise InvalidColorError,
+                        "Invalid number of components in ICC profile: #{iccprofile.N}"
+                    end
+                else
+                  raise InvalidColorError, "Unsupported color space: #{csbase}"
+                end
+            else
+              raise InvalidColorError, "Unsupported color space: #{csbase}"
+            end
+
+            if iccprofile
+              chunks <<
+              [
+                'iCCP',
+                'ICC Profile' + "\x00\x00" + Zlib::Deflate.deflate(iccprofile.data, Zlib::BEST_COMPRESSION)
+              ]
+            end
+
+            chunks <<
+            [
+              'PLTE',
+              palette
+            ]
+
+            bpr = w
+          else
+
+            if iccprofile
+              chunks <<
+              [
+                'iCCP',
+                'ICC Profile' + "\x00\x00" + Zlib::Deflate.deflate(iccprofile.data, Zlib::BEST_COMPRESSION)
+              ]
+            end
+
+            bpr = (bpc >> 3) * components * w
+          end
+
+          require 'zlib'
+           
+          nrows = pixels.size / bpr
+          nrows.times do |irow|
+            pixels.insert(irow * bpr + irow, "\x00")
+          end
+          
+          chunks <<
+          [
+            'IDAT',
+             Zlib::Deflate.deflate(pixels, Zlib::BEST_COMPRESSION)
+          ]
+
+          if self.Metadata.is_a?(Stream)
+            chunks <<
+            [
+              'tEXt',
+              "XML:com.adobe.xmp" + "\x00" + self.Metadata.data
+            ]
+          end
+
+          chunks << [ 'IEND', '' ]
+  
+          [ 'png', 
+            hdr + chunks.map!{ |chk|
+              [ chk[1].size, chk[0], chk[1], Zlib.crc32(chk[0] + chk[1]) ].pack("NA4A*N")
+            }.join
+          ]
+        end
+      end
     end
 
     class ReferenceDictionary < Dictionary

data/{origami → lib/origami}/object.rb

@@ -234,6 +234,12 @@ module Origami
     end
   end
 
+  WHITESPACES = "([ \\f\\t\\r\\n\\0]|%[^\\n]*\\n)*" #:nodoc:
+  WHITECHARS_NORET = "[ \\f\\t\\0]*" #:nodoc:
+  EOL = "\r\n" #:nodoc:
+  WHITECHARS = "[ \\f\\t\\r\\n\\0]*" #:nodoc:
+  REGEXP_WHITESPACES = Regexp.new(WHITESPACES) #:nodoc:
+    
   #
   # Parent module representing a PDF Object.
   # PDF specification declares a set of primitive object types :
@@ -248,9 +254,8 @@ module Origami
   # * Stream
   #
   module Object
-    
+
     TOKENS = %w{ obj endobj } #:nodoc:
-    
     @@regexp_obj = Regexp.new(WHITESPACES + "(\\d+)" + WHITESPACES + "(\\d+)" + WHITESPACES + TOKENS.first + WHITESPACES)
     @@regexp_endobj = Regexp.new(WHITESPACES + TOKENS.last + WHITESPACES)
 

data/{origami → lib/origami}/parser.rb

@@ -94,15 +94,7 @@ module Origami
     end
 
   end
-
-	EOL = "\r\n" #:nodoc:
-  DEFINED_TOKENS = "[<\\[(%\\/)\\]>]" #:nodoc:
-  WHITESPACES = "([ \\f\\t\\r\\n\\0]|%[^\\n]*\\n)*" #:nodoc:
-  WHITECHARS = "[ \\f\\t\\r\\n\\0]*" #:nodoc:
-  WHITECHARS_NORET = "[ \\f\\t\\0]*" #:nodoc:
   
-  REGEXP_WHITESPACES = Regexp.new(WHITESPACES) #:nodoc:
-
   class Parser #:nodoc:
 
     class ParsingError < Exception #:nodoc:
@@ -138,9 +130,8 @@ module Origami
         :verbosity => VERBOSE_INFO, # Verbose level.
         :ignore_errors => true,     # Try to keep on parsing when errors occur.
         :callback => Proc.new {},   # Callback procedure whenever a structure is read.
-        :password => '',            # Default password being tried when opening a protected document.
-        :prompt_password => Proc.new { print "Password: "; gets.chomp }, # Callback procedure to prompt password when document is encrypted.
-        :force => false             # Force PDF header detection
+        :logger => STDERR,          # Where to output parser messages.
+        :colorize_log => true       # Colorize parser output?
       }
      
       @options.update(options)
@@ -167,75 +158,78 @@ module Origami
         raise TypeError
       end
     
+      @logger = @options[:logger]
       @data = data
       @data.pos = 0
     end
-    
-    def parse_objects(file) #:nodoc:
+
+    def parse_object(pos = @data.pos) #:nodoc:
+      @data.pos = pos
+      
       begin
-        loop do 
-          obj = Object.parse(@data)
-          return if obj.nil?
-
-          trace "Read #{obj.type} object#{if obj.type != obj.real_type then " (" + obj.real_type.to_s.split('::').last + ")" end}, #{obj.reference}"
-          
-          file << obj
-                    
-          @options[:callback].call(obj)
-        end
+        obj = Object.parse(@data)
+        return if obj.nil?
         
+        trace "Read #{obj.type} object#{
+          if obj.type != obj.real_type
+            " (" + obj.real_type.to_s.split('::').last + ")" 
+          end
+        }, #{obj.reference}"
+
+        @options[:callback].call(obj)
+        obj
+
       rescue UnterminatedObjectError => e
         error e.message
-        file << e.obj
-
-        @options[:callback].call(e.obj)
+        obj = e.obj
 
         Object.skip_until_next_obj(@data)
-        retry
+        @options[:callback].call(obj)
+        obj
 
       rescue Exception => e
         error "Breaking on: #{(@data.peek(10) + "...").inspect} at offset 0x#{@data.pos.to_s(16)}"
         error "Last exception: [#{e.class}] #{e.message}"
-        debug "-> Stopped reading body : #{file.revisions.last.body.size} indirect objects have been parsed" if file.is_a?(PDF)
-        abort("Manually fix the file or set :ignore_errors parameter.") if not @options[:ignore_errors]
+        if not @options[:ignore_errors]
+          error "Manually fix the file or set :ignore_errors parameter."
+          raise
+        end
 
         debug 'Skipping this indirect object.'
-        raise(e) if not Object.skip_until_next_obj(@data)
+        raise if not Object.skip_until_next_obj(@data)
             
         retry
       end
     end
     
-    def parse_xreftable(file) #:nodoc:
+    def parse_xreftable(pos = @data.pos) #:nodoc:
+      @data.pos = pos
+
       begin
         info "...Parsing xref table..."
-        file.revisions.last.xreftable = XRef::Section.parse(@data)
-        @options[:callback].call(file.revisions.last.xreftable)
+        xreftable = XRef::Section.parse(@data)
+        @options[:callback].call(xreftable)
+
+        xreftable
       rescue Exception => e
         debug "Exception caught while parsing xref table : " + e.message
         warn "Unable to parse xref table! Xrefs might be stored into an XRef stream."
 
         @data.pos -= 'trailer'.length unless @data.skip_until(/trailer/).nil?
+
+        nil
       end
     end
     
-    def parse_trailer(file) #:nodoc:
+    def parse_trailer(pos = @data.pos) #:nodoc:
+      @data.pos = pos
+
       begin
         info "...Parsing trailer..."
         trailer = Trailer.parse(@data)
 
-        if file.is_a?(PDF)
-          xrefstm = file.get_object_by_offset(trailer.startxref) || 
-          (file.get_object_by_offset(trailer.XRefStm) if trailer.has_field? :XRefStm)
-        end
-
-        if not xrefstm.nil?
-          debug "Found a XRefStream for this revision at #{xrefstm.reference}"
-          file.revisions.last.xrefstm = xrefstm
-        end
-
-        file.revisions.last.trailer = trailer
-        @options[:callback].call(file.revisions.last.trailer)
+        @options[:callback].call(trailer)
+        trailer
        
       rescue Exception => e
         debug "Exception caught while parsing trailer : " + e.message
@@ -262,23 +256,54 @@ module Origami
     private
  
     def error(str = "") #:nodoc:
-      Console.colorprint("[error] #{str}\n", Console::Colors::RED, false, STDERR)
+      if @options[:colorize_log]
+        Console.colorprint("[error] #{str}\n", Console::Colors::RED, false, @logger)
+      else
+        @logger.puts "[error] #{str}"
+      end
     end
 
     def warn(str = "") #:nodoc:
-      Console.colorprint("[info ] Warning: #{str}\n", Console::Colors::YELLOW, false, STDERR) if @options[:verbosity] >= VERBOSE_INFO
+      if @options[:verbosity] >= VERBOSE_INFO
+        if @options[:colorize_log]
+          Console.colorprint("[info ] Warning: #{str}\n", Console::Colors::YELLOW, false, @logger) 
+        else
+          @logger.puts "[info ] #{str}"
+        end
+      end
     end
 
     def info(str = "") #:nodoc:
-      (Console.colorprint("[info ] ", Console::Colors::GREEN, false, STDERR); STDERR << "#{str}\n") if @options[:verbosity] >= VERBOSE_INFO
+      if @options[:verbosity] >= VERBOSE_INFO 
+        if @options[:colorize_log]
+          Console.colorprint("[info ] ", Console::Colors::GREEN, false, @logger)
+          @logger.puts str
+        else
+          @logger.puts "[info ] #{str}"
+        end
+      end
     end
     
     def debug(str = "") #:nodoc:
-      (Console.colorprint("[debug] ", Console::Colors::MAGENTA, false, STDERR); STDERR << "#{str}\n") if @options[:verbosity] >= VERBOSE_DEBUG
+      if @options[:verbosity] >= VERBOSE_DEBUG
+        if @options[:colorize_log]
+          Console.colorprint("[debug] ", Console::Colors::MAGENTA, false, @logger)
+          @logger.puts str 
+        else
+          @logger.puts "[debug] #{str}"
+        end
+      end
     end
     
     def trace(str = "") #:nodoc:
-      (Console.colorprint("[trace] ", Console::Colors::CYAN, false, STDERR); STDERR << "#{str}\n") if @options[:verbosity] >= VERBOSE_INSANE
+      if @options[:verbosity] >= VERBOSE_INSANE
+        if @options[:colorize_log]
+          Console.colorprint("[trace] ", Console::Colors::CYAN, false, @logger)
+          @logger.puts str
+        else
+          @logger.puts "[trace] #{str}"
+        end
+      end
     end
   end
 end