pure_jpeg 0.1.0 → 0.3.0

data/lib/pure_jpeg/image.rb

@@ -3,22 +3,33 @@
 module PureJPEG
   # A decoded JPEG image with pixel-level access.
   #
-  # Implements the same pixel source interface (+width+, +height+, +[x, y]+)
-  # as encoder inputs, so a decoded image can be passed directly to
-  # {PureJPEG.encode} for re-encoding.
+  # Internally stores pixels as packed integers (+r << 16 | g << 8 | b+) to
+  # avoid per-pixel object allocation. Implements the same pixel source
+  # interface (+width+, +height+, +[x, y]+) as encoder inputs, so a decoded
+  # image can be passed directly to {PureJPEG.encode} for re-encoding.
   class Image
     # @return [Integer] image width in pixels
     attr_reader :width
     # @return [Integer] image height in pixels
     attr_reader :height
 
+    # @return [Array<Integer>] flat row-major array of packed RGB integers.
+    #   Format: +(r << 16) | (g << 8) | b+.
+    attr_reader :packed_pixels
+
+    # @return [String, nil] raw ICC color profile data, if present in the source JPEG
+    attr_reader :icc_profile
+
     # @param width [Integer]
     # @param height [Integer]
-    # @param pixels [Array<Source::Pixel>] flat row-major array of pixels
-    def initialize(width, height, pixels)
+    # @param packed_pixels [Array<Integer>] flat row-major array of packed RGB
+    #   integers in the format +(r << 16) | (g << 8) | b+
+    # @param icc_profile [String, nil] raw ICC profile bytes
+    def initialize(width, height, packed_pixels, icc_profile: nil)
       @width = width
       @height = height
-      @pixels = pixels
+      @packed_pixels = packed_pixels
+      @icc_profile = icc_profile
     end
 
     # Retrieve a pixel by coordinate.
@@ -27,7 +38,8 @@ module PureJPEG
     # @param y [Integer] row (0-based)
     # @return [Source::Pixel] pixel with +.r+, +.g+, +.b+ in 0-255
     def [](x, y)
-      @pixels[y * @width + x]
+      color = @packed_pixels[y * @width + x]
+      Source::Pixel.new((color >> 16) & 0xFF, (color >> 8) & 0xFF, color & 0xFF)
     end
 
     # Set a pixel by coordinate.
@@ -37,7 +49,8 @@ module PureJPEG
     # @param pixel [Source::Pixel] replacement pixel
     # @return [Source::Pixel]
     def []=(x, y, pixel)
-      @pixels[y * @width + x] = pixel
+      @packed_pixels[y * @width + x] = (pixel.r << 16) | (pixel.g << 8) | pixel.b
+      pixel
     end
 
     # Iterate over every pixel in the image.
@@ -53,5 +66,24 @@ module PureJPEG
         end
       end
     end
+
+    # Iterate over every pixel without allocating Pixel structs.
+    #
+    # @yieldparam x [Integer] column
+    # @yieldparam y [Integer] row
+    # @yieldparam r [Integer] red component (0-255)
+    # @yieldparam g [Integer] green component (0-255)
+    # @yieldparam b [Integer] blue component (0-255)
+    # @return [void]
+    def each_rgb
+      i = 0
+      @height.times do |y|
+        @width.times do |x|
+          color = @packed_pixels[i]
+          yield x, y, (color >> 16) & 0xFF, (color >> 8) & 0xFF, color & 0xFF
+          i += 1
+        end
+      end
+    end
   end
 end

data/lib/pure_jpeg/info.rb

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+module PureJPEG
+  # Lightweight metadata returned by {.info}.
+  Info = Struct.new(:width, :height, :component_count, :progressive, :icc_profile, keyword_init: true)
+end

data/lib/pure_jpeg/jfif_reader.rb

@@ -3,20 +3,33 @@
 module PureJPEG
   class JFIFReader
     attr_reader :width, :height, :components, :quant_tables, :huffman_tables,
-                :scan_components, :scan_data, :restart_interval
+                :restart_interval, :progressive, :scans, :icc_profile
 
     Component = Struct.new(:id, :h_sampling, :v_sampling, :qt_id)
     ScanComponent = Struct.new(:id, :dc_table_id, :ac_table_id)
+    Scan = Struct.new(:components, :spectral_start, :spectral_end, :successive_high, :successive_low, :data, :huffman_tables)
 
-    def initialize(data)
+    def initialize(data, stop_after_frame: false)
       @data = data.b
+      @stop_after_frame = stop_after_frame
       @pos = 0
       @quant_tables = {}
       @huffman_tables = {}
       @components = []
-      @scan_components = []
       @restart_interval = 0
+      @progressive = false
+      @scans = []
+      @icc_chunks = {}
       parse
+      assemble_icc_profile
+    end
+
+    def scan_components
+      @scans.first&.components || []
+    end
+
+    def scan_data
+      @scans.first&.data || "".b
     end
 
     private
@@ -27,7 +40,9 @@ module PureJPEG
       loop do
         marker = read_marker
         case marker
-        when 0xE0..0xEF # APP0-APP15
+        when 0xE2 # APP2 (may contain ICC profile)
+          parse_app2
+        when 0xE0, 0xE1, 0xE3..0xEF # APP0, APP1, APP3-APP15
           skip_segment
         when 0xDB # DQT
           parse_dqt
@@ -35,14 +50,23 @@ module PureJPEG
           parse_dht
         when 0xC0 # SOF0 (baseline)
           parse_sof0
+          return if @stop_after_frame
+        when 0xC2 # SOF2 (progressive)
+          parse_sof0
+          @progressive = true
+          return if @stop_after_frame
         when 0xDA # SOS
-          parse_sos
-          extract_scan_data
-          return
+          scan = parse_sos
+          scan.data = extract_scan_data
+          scan.huffman_tables = @huffman_tables.dup
+          @scans << scan
+          return unless @progressive
         when 0xFE # COM (comment)
           skip_segment
         when 0xDD # DRI (restart interval)
           parse_dri
+        when 0xD9 # EOI
+          return
         else
           skip_segment
         end
@@ -50,6 +74,7 @@ module PureJPEG
     end
 
     def read_byte
+      raise PureJPEG::DecodeError, "Unexpected end of JPEG data" if @pos >= @data.bytesize
       byte = @data.getbyte(@pos)
       @pos += 1
       byte
@@ -61,7 +86,7 @@ module PureJPEG
 
     def read_marker
       byte = read_byte
-      raise "Expected 0xFF, got 0x#{byte.to_s(16)}" unless byte == 0xFF
+      raise PureJPEG::DecodeError, "Expected 0xFF, got 0x#{byte.to_s(16)}" unless byte == 0xFF
       # Skip padding 0xFF bytes
       code = read_byte
       code = read_byte while code == 0xFF
@@ -70,7 +95,29 @@ module PureJPEG
 
     def expect_marker(expected)
       marker = read_marker
-      raise "Expected marker 0x#{expected.to_s(16)}, got 0x#{marker.to_s(16)}" unless marker == expected
+      raise PureJPEG::DecodeError, "Expected marker 0x#{expected.to_s(16)}, got 0x#{marker.to_s(16)}" unless marker == expected
+    end
+
+    ICC_PROFILE_SIG = "ICC_PROFILE\0".b
+
+    def parse_app2
+      length = read_u16
+      end_pos = @pos + length - 2
+
+      if length >= 16 && @data[@pos, 12] == ICC_PROFILE_SIG
+        @pos += 12
+        seq_no = read_byte
+        _total = read_byte
+        @icc_chunks[seq_no] = @data[@pos, end_pos - @pos]
+      end
+
+      @pos = end_pos
+    end
+
+    def assemble_icc_profile
+      return if @icc_chunks.empty?
+
+      @icc_profile = @icc_chunks.sort_by(&:first).map(&:last).join.b
     end
 
     def skip_segment
@@ -136,7 +183,7 @@ module PureJPEG
       read_u16 # length
       num_components = read_byte
 
-      @scan_components = Array.new(num_components) do
+      components = Array.new(num_components) do
         id = read_byte
         tables = read_byte
         dc_id = (tables >> 4) & 0x0F
@@ -144,8 +191,12 @@ module PureJPEG
         ScanComponent.new(id, dc_id, ac_id)
       end
 
-      # Spectral selection and approximation (ignored for baseline)
-      3.times { read_byte }
+      ss = read_byte  # spectral selection start
+      se = read_byte  # spectral selection end
+      ahl = read_byte # successive approximation
+      ah = (ahl >> 4) & 0x0F
+      al = ahl & 0x0F
+      Scan.new(components, ss, se, ah, al, nil)
     end
 
     def parse_dri
@@ -156,18 +207,20 @@ module PureJPEG
     # Extract entropy-coded scan data (everything from current position to EOI marker).
     def extract_scan_data
       start = @pos
+      len = @data.bytesize
       # Scan forward looking for a marker that isn't a stuffing byte or restart
-      while @pos < @data.bytesize - 1
-        if @data.getbyte(@pos) == 0xFF
-          next_byte = @data.getbyte(@pos + 1)
-          # 0x00 is byte stuffing, 0xD0-0xD7 are restart markers — all part of scan data
-          if next_byte != 0x00 && !(next_byte >= 0xD0 && next_byte <= 0xD7) && next_byte != 0xFF
-            break
-          end
+      while @pos < len - 1
+        found = @data.index("\xFF".b, @pos)
+        break unless found && found < len - 1
+        @pos = found
+        next_byte = @data.getbyte(@pos + 1)
+        # 0x00 is byte stuffing, 0xD0-0xD7 are restart markers, 0xFF is padding — all part of scan data
+        if next_byte != 0x00 && !(next_byte >= 0xD0 && next_byte <= 0xD7) && next_byte != 0xFF
+          break
         end
-        @pos += 1
+        @pos += 2
       end
-      @scan_data = @data[start...@pos]
+      @data[start...@pos]
     end
   end
 end

data/lib/pure_jpeg/source/chunky_png_source.rb

@@ -19,22 +19,25 @@ module PureJPEG
 
       # @param image [ChunkyPNG::Image] the source PNG image
       def initialize(image)
-        @image = image
         @width = image.width
         @height = image.height
+        @packed_pixels = image.pixels
       end
 
+      # @return [Array<Integer>] flat row-major array of packed RGBA integers
+      attr_reader :packed_pixels
+
       # Retrieve a pixel at the given coordinate.
       #
       # @param x [Integer] column (0-based)
       # @param y [Integer] row (0-based)
       # @return [Pixel]
       def [](x, y)
-        color = @image[x, y]
+        color = @packed_pixels[y * @width + x]
         Pixel.new(
-          ChunkyPNG::Color.r(color),
-          ChunkyPNG::Color.g(color),
-          ChunkyPNG::Color.b(color)
+          (color >> 24) & 0xFF,
+          (color >> 16) & 0xFF,
+          (color >> 8) & 0xFF
         )
       end
     end

data/lib/pure_jpeg/source/raw_source.rb

@@ -27,7 +27,8 @@ module PureJPEG
       def initialize(width, height, &block)
         @width = width
         @height = height
-        @pixels = Array.new(width * height)
+        black = Pixel.new(0, 0, 0)
+        @pixels = Array.new(width * height, black)
 
         if block
           height.times do |y|

data/lib/pure_jpeg/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module PureJPEG
-  VERSION = "0.1.0"
+  VERSION = "0.3.0"
 end

data/lib/pure_jpeg.rb

@@ -16,6 +16,7 @@ require_relative "pure_jpeg/huffman/encoder"
 require_relative "pure_jpeg/huffman/decoder"
 require_relative "pure_jpeg/jfif_writer"
 require_relative "pure_jpeg/jfif_reader"
+require_relative "pure_jpeg/info"
 require_relative "pure_jpeg/image"
 require_relative "pure_jpeg/encoder"
 require_relative "pure_jpeg/decoder"
@@ -25,6 +26,12 @@ require_relative "pure_jpeg/decoder"
   # Supports baseline DCT (SOF0) with 8-bit precision, grayscale and YCbCr
   # color (4:2:0 chroma subsampling), and standard Huffman tables (Annex K).
 module PureJPEG
+  # Raised when decoding invalid or unsupported JPEG data.
+  class DecodeError < StandardError; end
+
+  # Maximum image dimension (width or height) allowed for encoding and decoding.
+  MAX_DIMENSION = 8192
+
   # Encode a pixel source as a JPEG.
   #
   # @param source [#width, #height, #[]] any object responding to +width+,
@@ -57,4 +64,27 @@ module PureJPEG
   def self.read(path_or_data)
     Decoder.decode(path_or_data)
   end
+
+  # Read JPEG dimensions and basic frame metadata without decoding scan data.
+  #
+  # @param path_or_data [String] a file path or raw JPEG bytes
+  # @return [Info] image metadata parsed from the frame header
+  def self.info(path_or_data)
+    data = if path_or_data.is_a?(String) && !path_or_data.start_with?("\xFF\xD8".b) && File.exist?(path_or_data)
+             File.binread(path_or_data)
+           else
+             path_or_data.b
+           end
+
+    jfif = JFIFReader.new(data, stop_after_frame: true)
+    raise DecodeError, "JPEG frame header not found" unless jfif.width && jfif.height
+
+    Info.new(
+      width: jfif.width,
+      height: jfif.height,
+      component_count: jfif.components.length,
+      progressive: jfif.progressive,
+      icc_profile: jfif.icc_profile
+    )
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pure_jpeg
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Peter Cooper
@@ -57,6 +57,7 @@ files:
 - lib/pure_jpeg/huffman/encoder.rb
 - lib/pure_jpeg/huffman/tables.rb
 - lib/pure_jpeg/image.rb
+- lib/pure_jpeg/info.rb
 - lib/pure_jpeg/jfif_reader.rb
 - lib/pure_jpeg/jfif_writer.rb
 - lib/pure_jpeg/quantization.rb
@@ -78,7 +79,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.7.0
+      version: 3.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="