pure_jpeg 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 81f59b74746cbb7c575aa22e250667b8b126a542613833f2e45b57685fed02c0
-  data.tar.gz: 87fb8c2b6dd5035d93c4326a37fac8e43ade2af88f92a3dd1f7761960f675126
+  metadata.gz: 41b11ef04efbfb35b257ce2e93e40ae4b4fd07fec3fd05918b87eacba9a517eb
+  data.tar.gz: 460755287366135f012fca8975822c9c50b52fa9e55144c3d1afc3c00538af37
 SHA512:
-  metadata.gz: 930f8db2b6ab86080c115e77f56e0918853e455dbcd18129daa5aaca77715df198a502010ae218275799e8b364f115232e11139ffcb42ca981c57478ef12b45b
-  data.tar.gz: 54c50b3a2316c6fa0b9db38fcabdd589bcc17d2edfeff653a28ec4054a72c2b5615eef5fd9f123fb31ce56448864495f49942bf63c4536d00c21fd4e7a6eb4f2
+  metadata.gz: 2d9c6cb32fb7197cd2fb78bf391e970729036aab6c37b4215c8fca9aef687ca2079d209367956618e6951aaf9f6e809030a64e724b8bc34c070f0de1ad373680
+  data.tar.gz: 9d88a0c1e1d15068afe4827f838fa6736c1fde4403720edb32ac4c6e840619ccacf9ac7788e6b1ebe9df6dd8b61cc096bcac07424cd03b8ce9e89f9770ad1977

data/CHANGELOG.md

@@ -1,5 +1,34 @@
 # Changelog
 
+## 0.4.1
+
+This is a robustness and compatibility release. It makes decoding more reliable
+across valid JPEG variants, improves handling of malformed input, and strengthens
+Spinel support while preserving the existing public API and encoder output.
+
+Fixes:
+
+- Decode progressive images correctly when component edges require padded blocks
+- Preserve each scan's restart interval and each component's original quantization table
+- Decode baseline images with separate component scans and handle subsampled luminance
+- Handle JPEG marker fill bytes correctly between scans and at restart boundaries
+- Validate restart markers without recursion; reject malformed frame/scan parameters,
+  invalid Huffman tables, excessive coefficient runs, and incomplete scan data with `DecodeError`
+- Reject unsupported precision and RGB/Adobe color transforms explicitly
+- Read ICC headers after the frame header in `PureJPEG.info`; ignore incomplete or
+  inconsistent multipart profiles instead of returning partial profile bytes
+- Treat binary garbage containing null bytes as data rather than a filesystem path
+- Avoid a Spinel compiler bug in conditional hash assignment during decoding
+
+Testing and packaging:
+
+- Add small libjpeg-turbo fixtures with trusted decoded-pixel hashes and malformed-input regressions
+- Add Spinel pixel-parity checks for the decoder fixes; all four package checks and
+  all eight selected RawSource tests pass on Spinel revision `2406a5649`
+- Keep all existing tests, public API signatures, source-adapter behavior, and encoder output unchanged
+- Run CI on pushes to `main` and smoke-test the built, installed gem without development dependencies
+- Include creative-options documentation and IJG notices in the gem; correct the DCT algorithm attribution
+
 ## 0.4.0
 
 Performance:

data/CREATIVE.md

@@ -0,0 +1,100 @@
+# Creative encoding with PureJPEG
+
+PureJPEG exposes access to several 'knobs' to manipulate the JPEG encoding pipeline. These produce a range of aesthetic effects by controlling how the DCT frequency coefficients are quantized.
+
+All examples assume:
+
+```ruby
+require "chunky_png"
+require_relative "lib/pure_jpeg"
+
+image = ChunkyPNG::Image.from_file("input.png")
+source = PureJPEG::Source::ChunkyPNGSource.new(image)
+```
+
+## Scrambled quantization ("early digicam" look)
+
+The JPEG spec stores quantization tables in zigzag order. Enabling `scramble_quantization` writes them in raster order instead, which means any standard viewer applies the wrong quantization values to the wrong frequency coefficients. The result is a chaotic, crunchy artifact pattern reminiscent of early 2000s digital cameras (what I really wanted in the first place).
+
+```ruby
+PureJPEG.encode(source, quality: 20, scramble_quantization: true).write("scrambled.jpg")
+```
+
+Lower quality values amplify the effect.
+
+## Chroma crush (sharp detail, broken color)
+
+Set high luminance quality but aggressively compress the chrominance channels. Detail and edges stay sharp but the color information collapses into large blocky patches with hue shifts.
+
+```ruby
+PureJPEG.encode(source, quality: 90, chroma_quality: 5).write("chromacrush.jpg")
+```
+
+## Luma crush (soft image, faithful color)
+
+The opposite: crush the luminance channel while preserving chrominance. Produces a soft, almost oil-painting quality where the image is blocky and low-detail but the colors remain surprisingly accurate.
+
+```ruby
+PureJPEG.encode(source, quality: 10, chroma_quality: 95).write("lumacrush.jpg")
+```
+
+## DC-only (8x8 mosaic)
+
+A custom quantization table that preserves only the DC coefficient (the average brightness of each 8x8 block) and kills all 63 AC coefficients. Every block becomes a single flat color, producing a hard mosaic effect.
+
+```ruby
+dc_only = [1] + [255] * 63
+PureJPEG.encode(source, luminance_table: dc_only, chrominance_table: dc_only).write("dconly.jpg")
+```
+
+You can soften the mosaic by letting a few low-frequency AC coefficients through:
+
+```ruby
+# Keep DC and the first few AC coefficients
+gentle_mosaic = [1, 1, 1, 2, 4, 8] + [255] * 58
+PureJPEG.encode(source, luminance_table: gentle_mosaic, chrominance_table: gentle_mosaic).write("gentle_mosaic.jpg")
+```
+
+## Inverted frequency emphasis
+
+Normally JPEG preserves low frequencies (smooth gradients) and discards high frequencies (fine detail). This modifier inverts that, preserving edges and texture while crushing smooth areas. The result is an embossed or etched look.
+
+```ruby
+inverter = ->(table, _channel) {
+  max = table.max
+  table.map { |v| [max + 1 - v, 1].max }
+}
+PureJPEG.encode(source, quality: 30, quantization_modifier: inverter).write("inverted.jpg")
+```
+
+## Combining effects
+
+The `quantization_modifier` proc receives the table and a channel identifier (`:luminance` or `:chrominance`), so you can apply different transformations per channel:
+
+```ruby
+modifier = ->(table, channel) {
+  case channel
+  when :luminance
+    # Sharpen luma by halving quantization values
+    table.map { |v| [v / 2, 1].max }
+  when :chrominance
+    # Posterize color by doubling quantization values
+    table.map { |v| [v * 2, 255].min }
+  end
+}
+PureJPEG.encode(source, quality: 50, quantization_modifier: modifier).write("combined.jpg")
+```
+
+## Full option reference
+
+```ruby
+PureJPEG.encode(source,
+  quality: 85,                    # 1-100, overall compression level
+  grayscale: false,               # encode as single-channel grayscale
+  chroma_quality: nil,            # 1-100, independent Cb/Cr quality (defaults to quality)
+  luminance_table: nil,           # custom 64-element quantization table for Y (raster order)
+  chrominance_table: nil,         # custom 64-element quantization table for Cb/Cr (raster order)
+  quantization_modifier: nil,     # proc(table, :luminance/:chrominance) -> modified table
+  scramble_quantization: false    # write quant tables in wrong order (digicam effect)
+)
+```

data/LICENSE

@@ -19,3 +19,10 @@ 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.
+
+The integer DCT implementation in lib/pure_jpeg/dct.rb is adapted from the
+Independent JPEG Group's jfdctint.c and jidctint.c. Its upstream copyright,
+disclaimer, and distribution terms are included in LICENSE-IJG. PureJPEG's
+adaptation ports the transforms to Ruby arrays, removes the C integration
+and scaled-output variants, and normalizes forward coefficients before
+quantization. The IJG-derived portions remain subject to those terms.

data/LICENSE-IJG

@@ -0,0 +1,260 @@
+libjpeg-turbo note:  This file has been modified by The libjpeg-turbo Project
+to include only information relevant to libjpeg-turbo, to wordsmith certain
+sections, and to remove impolitic language that existed in the libjpeg v8
+README.  It is included only for reference.  Please see README.md for
+information specific to libjpeg-turbo.
+
+
+The Independent JPEG Group's JPEG software
+==========================================
+
+This distribution contains a release of the Independent JPEG Group's free JPEG
+software.  You are welcome to redistribute this software and to use it for any
+purpose, subject to the conditions under LEGAL ISSUES, below.
+
+This software is the work of Tom Lane, Guido Vollbeding, Philip Gladstone,
+Bill Allombert, Jim Boucher, Lee Crocker, Bob Friesenhahn, Ben Jackson,
+Julian Minguillon, Luis Ortiz, George Phillips, Davide Rossi, Ge' Weijers,
+and other members of the Independent JPEG Group.
+
+IJG is not affiliated with the ISO/IEC JTC1/SC29/WG1 standards committee
+(also known as JPEG, together with ITU-T SG16).
+
+
+DOCUMENTATION ROADMAP
+=====================
+
+This file contains the following sections:
+
+OVERVIEW            General description of JPEG and the IJG software.
+LEGAL ISSUES        Copyright, lack of warranty, terms of distribution.
+REFERENCES          Where to learn more about JPEG.
+ARCHIVE LOCATIONS   Where to find newer versions of this software.
+FILE FORMAT WARS    Software *not* to get.
+TO DO               Plans for future IJG releases.
+
+Other documentation files in the distribution are:
+
+User documentation:
+  doc/usage.txt         Usage instructions for cjpeg, djpeg, jpegtran,
+                        rdjpgcom, and wrjpgcom.
+  doc/*.1               Unix-style man pages for programs (same info as
+                        usage.txt).
+  doc/wizard.txt        Advanced usage instructions for JPEG wizards only.
+  doc/change.log        Version-to-version change highlights.
+Programmer and internal documentation:
+  doc/libjpeg.txt       How to use the JPEG library in your own programs.
+  src/example.c         Sample code for calling the JPEG library.
+  doc/structure.txt     Overview of the JPEG library's internal structure.
+  doc/coderules.txt     Coding style rules --- please read if you contribute
+                        code.
+
+Please read at least usage.txt.  Some information can also be found in the JPEG
+FAQ (Frequently Asked Questions) article.  See ARCHIVE LOCATIONS below to find
+out where to obtain the FAQ article.
+
+If you want to understand how the JPEG code works, we suggest reading one or
+more of the REFERENCES, then looking at the documentation files (in roughly
+the order listed) before diving into the code.
+
+
+OVERVIEW
+========
+
+This package contains C software to implement JPEG image encoding, decoding,
+and transcoding.  JPEG (pronounced "jay-peg") is a standardized compression
+method for full-color and grayscale images.  JPEG's strong suit is compressing
+photographic images or other types of images that have smooth color and
+brightness transitions between neighboring pixels.  Images with sharp lines or
+other abrupt features may not compress well with JPEG, and a higher JPEG
+quality may have to be used to avoid visible compression artifacts with such
+images.
+
+JPEG is normally lossy, meaning that the output pixels are not necessarily
+identical to the input pixels.  However, on photographic content and other
+"smooth" images, very good compression ratios can be obtained with no visible
+compression artifacts, and extremely high compression ratios are possible if
+you are willing to sacrifice image quality (by reducing the "quality" setting
+in the compressor.)
+
+This software implements JPEG baseline, extended-sequential, progressive, and
+lossless compression processes.  Provision is made for supporting all variants
+of these processes, although some uncommon parameter settings aren't
+implemented yet.  We have made no provision for supporting the hierarchical
+processes defined in the standard.
+
+We provide a set of library routines for reading and writing JPEG image files,
+plus two sample applications "cjpeg" and "djpeg", which use the library to
+perform conversion between JPEG and some other popular image file formats.
+The library is intended to be reused in other applications.
+
+In order to support file conversion and viewing software, we have included
+considerable functionality beyond the bare JPEG coding/decoding capability;
+for example, the color quantization modules are not strictly part of JPEG
+decoding, but they are essential for output to colormapped file formats.  These
+extra functions can be compiled out of the library if not required for a
+particular application.
+
+We have also included "jpegtran", a utility for lossless transcoding between
+different JPEG processes, and "rdjpgcom" and "wrjpgcom", two simple
+applications for inserting and extracting textual comments in JFIF files.
+
+The emphasis in designing this software has been on achieving portability and
+flexibility, while also making it fast enough to be useful.  In particular,
+the software is not intended to be read as a tutorial on JPEG.  (See the
+REFERENCES section for introductory material.)  Rather, it is intended to
+be reliable, portable, industrial-strength code.  We do not claim to have
+achieved that goal in every aspect of the software, but we strive for it.
+
+We welcome the use of this software as a component of commercial products.
+No royalty is required, but we do ask for an acknowledgement in product
+documentation, as described under LEGAL ISSUES.
+
+
+LEGAL ISSUES
+============
+
+In plain English:
+
+1. We don't promise that this software works.  (But if you find any bugs,
+   please let us know!)
+2. You can use this software for whatever you want.  You don't have to pay us.
+3. You may not pretend that you wrote this software.  If you use it in a
+   program, you must acknowledge somewhere in your documentation that
+   you've used the IJG code.
+
+In legalese:
+
+The authors make NO WARRANTY or representation, either express or implied,
+with respect to this software, its quality, accuracy, merchantability, or
+fitness for a particular purpose.  This software is provided "AS IS", and you,
+its user, assume the entire risk as to its quality and accuracy.
+
+This software is copyright (C) 1991-2020, Thomas G. Lane, Guido Vollbeding.
+All Rights Reserved except as specified below.
+
+Permission is hereby granted to use, copy, modify, and distribute this
+software (or portions thereof) for any purpose, without fee, subject to these
+conditions:
+(1) If any part of the source code for this software is distributed, then this
+README file must be included, with this copyright and no-warranty notice
+unaltered; and any additions, deletions, or changes to the original files
+must be clearly indicated in accompanying documentation.
+(2) If only executable code is distributed, then the accompanying
+documentation must state that "this software is based in part on the work of
+the Independent JPEG Group".
+(3) Permission for use of this software is granted only if the user accepts
+full responsibility for any undesirable consequences; the authors accept
+NO LIABILITY for damages of any kind.
+
+These conditions apply to any software derived from or based on the IJG code,
+not just to the unmodified library.  If you use our work, you ought to
+acknowledge us.
+
+Permission is NOT granted for the use of any IJG author's name or company name
+in advertising or publicity relating to this software or products derived from
+it.  This software may be referred to only as "the Independent JPEG Group's
+software".
+
+We specifically permit and encourage the use of this software as the basis of
+commercial products, provided that all warranty or liability claims are
+assumed by the product vendor.
+
+
+REFERENCES
+==========
+
+We recommend reading one or more of these references before trying to
+understand the innards of the JPEG software.
+
+The best short technical introduction to the JPEG compression algorithm is
+        Wallace, Gregory K.  "The JPEG Still Picture Compression Standard",
+        Communications of the ACM, April 1991 (vol. 34 no. 4), pp. 30-44.
+(Adjacent articles in that issue discuss MPEG motion picture compression,
+applications of JPEG, and related topics.)  If you don't have the CACM issue
+handy, a PDF file containing a revised version of Wallace's article is
+available at http://www.ijg.org/files/Wallace.JPEG.pdf.  The file (actually
+a preprint for an article that appeared in IEEE Trans. Consumer Electronics)
+omits the sample images that appeared in CACM, but it includes corrections
+and some added material.  Note: the Wallace article is copyright ACM and IEEE,
+and it may not be used for commercial purposes.
+
+A somewhat less technical, more leisurely introduction to JPEG can be found in
+"The Data Compression Book" by Mark Nelson and Jean-loup Gailly, published by
+M&T Books (New York), 2nd ed. 1996, ISBN 1-55851-434-1.  This book provides
+good explanations and example C code for a multitude of compression methods
+including JPEG.  It is an excellent source if you are comfortable reading C
+code but don't know much about data compression in general.  The book's JPEG
+sample code is far from industrial-strength, but when you are ready to look
+at a full implementation, you've got one here...
+
+The best currently available description of JPEG is the textbook "JPEG Still
+Image Data Compression Standard" by William B. Pennebaker and Joan L.
+Mitchell, published by Van Nostrand Reinhold, 1993, ISBN 0-442-01272-1.
+Price US$59.95, 638 pp.  The book includes the complete text of the ISO JPEG
+standards (DIS 10918-1 and draft DIS 10918-2).
+
+The original JPEG standard is divided into two parts, Part 1 being the actual
+specification, while Part 2 covers compliance testing methods.  Part 1 is
+titled "Digital Compression and Coding of Continuous-tone Still Images,
+Part 1: Requirements and guidelines" and has document numbers ISO/IEC IS
+10918-1, ITU-T T.81.  Part 2 is titled "Digital Compression and Coding of
+Continuous-tone Still Images, Part 2: Compliance testing" and has document
+numbers ISO/IEC IS 10918-2, ITU-T T.83.
+
+The JPEG standard does not specify all details of an interchangeable file
+format.  For the omitted details, we follow the "JFIF" conventions, revision
+1.02.  JFIF version 1 has been adopted as ISO/IEC 10918-5 (05/2013) and
+Recommendation ITU-T T.871 (05/2011): Information technology - Digital
+compression and coding of continuous-tone still images: JPEG File Interchange
+Format (JFIF).  It is available as a free download in PDF file format from
+https://www.iso.org/standard/54989.html and http://www.itu.int/rec/T-REC-T.871.
+A PDF file of the older JFIF 1.02 specification is available at
+http://www.w3.org/Graphics/JPEG/jfif3.pdf.
+
+The TIFF 6.0 file format specification can be obtained from
+http://mirrors.ctan.org/graphics/tiff/TIFF6.ps.gz.  The JPEG incorporation
+scheme found in the TIFF 6.0 spec of 3-June-92 has a number of serious
+problems.  IJG does not recommend use of the TIFF 6.0 design (TIFF Compression
+tag 6).  Instead, we recommend the JPEG design proposed by TIFF Technical Note
+#2 (Compression tag 7).  Copies of this Note can be obtained from
+http://www.ijg.org/files/.  It is expected that the next revision
+of the TIFF spec will replace the 6.0 JPEG design with the Note's design.
+Although IJG's own code does not support TIFF/JPEG, the free libtiff library
+uses our library to implement TIFF/JPEG per the Note.
+
+
+ARCHIVE LOCATIONS
+=================
+
+The "official" archive site for this software is www.ijg.org.
+The most recent released version can always be found there in
+directory "files".
+
+The JPEG FAQ (Frequently Asked Questions) article is a source of some
+general information about JPEG.  It is available at
+http://www.faqs.org/faqs/jpeg-faq.
+
+
+FILE FORMAT COMPATIBILITY
+=========================
+
+This software implements ITU T.81 | ISO/IEC 10918 with some extensions from
+ITU T.871 | ISO/IEC 10918-5 (JPEG File Interchange Format-- see REFERENCES).
+Informally, the term "JPEG image" or "JPEG file" most often refers to JFIF or
+a subset thereof, but there are other formats containing the name "JPEG" that
+are incompatible with the original JPEG standard or with JFIF (for instance,
+JPEG 2000 and JPEG XR).  This software therefore does not support these
+formats.  Indeed, one of the original reasons for developing this free software
+was to help force convergence on a common, interoperable format standard for
+JPEG files.
+
+JFIF is a minimal or "low end" representation.  TIFF/JPEG (TIFF revision 6.0 as
+modified by TIFF Technical Note #2) can be used for "high end" applications
+that need to record a lot of additional data about an image.
+
+
+TO DO
+=====
+
+Please send bug reports, offers of help, etc. to jpeg-info@jpegclub.org.

data/README.md

@@ -6,7 +6,7 @@
 
 Convert PNG or other pixel data to JPEG. Or the other way! Implements baseline JPEG encoding (DCT, Huffman, 4:2:0 chroma subsampling) and decodes both baseline and progressive JPEGs. Exposes a variety of encoding options to adjust parts of the JPEG pipeline not normally available (I needed this to recreate the JPEG compression styles of older digital cameras - don't ask..)
 
-It works on CRuby 3.0+, TruffleRuby 33.0, JRuby 10.0, and [Spinel](https://github.com/matz/spinel) (tested at `7f08abd9`). There's *almost* 100% test coverage - I need to find some "broken" JPEGs to do the rest (hit me up if you have any sources..)
+It works on CRuby 3.0+, TruffleRuby 33.0, JRuby 10.0, and [Spinel](https://github.com/matz/spinel) (tested at `7f08abd9`). Tests include external JPEG fixtures with pixel expectations generated by libjpeg-turbo, alongside round-trip and malformed-input checks.
 
 > [!NOTE]
 > Rubyists might find the [AI Disclosure](#ai-disclosure) section below of interest.
@@ -23,6 +23,15 @@ gem "pure_jpeg"
 gem install pure_jpeg
 ```
 
+> [!NOTE]
+> Using [Spinel](https://github.com/matz/spinel)? Add PureJPEG from your Spin project directory:
+>
+> ```sh
+> spin add pure_jpeg --git https://github.com/peterc/pure_jpeg
+> ```
+>
+> Then use `require "pure_jpeg"` in your code as usual.
+
 There are no runtime dependencies. [ChunkyPNG](https://github.com/wvanbergen/chunky_png) is optional (though quite useful) if you want to use `from_chunky_png`.
 
 `examples/` contains some useful example scripts for basic JPEG to PNG and PNG to JPEG conversion if you want to do some quick tests without writing code.
@@ -151,8 +160,13 @@ info.width           # => 1024
 info.height          # => 768
 info.component_count # => 3
 info.progressive     # => false
+info.icc_profile     # => binary profile bytes, or nil
 ```
 
+Metadata queries read headers through the first scan marker, without decoding
+pixels. Incomplete or inconsistent multipart ICC profiles are ignored and
+reported as `nil`. ICC extraction does not perform color-profile conversion.
+
 ### Iterating pixels
 
 ```ruby
@@ -198,8 +212,17 @@ Decoding:
 - 1-component (grayscale) and 3-component (YCbCr) images
 - Any chroma subsampling factor (4:4:4, 4:2:2, 4:2:0, etc.)
 - Restart markers (DRI/RST)
+- Separate component scans in baseline JPEGs
+
+Encoding and decoding allow dimensions up to 8192 pixels on each axis. The
+decoder allocates whole-image buffers; this dimension limit is not a memory
+budget. `PureJPEG.info` can inspect dimensions without allocating pixel buffers.
+Invalid or unsupported JPEG data raises `PureJPEG::DecodeError`.
 
-Not supported: arithmetic coding, 12-bit precision, EXIF/ICC profile preservation, adding a default background for transparent sources (see what happens above!). Largely because I don't need these, but they are all do-able, especially with how loosely coupled this library is internally. Raise an issue if you really care about them!
+Not supported: arithmetic coding, 12-bit precision, RGB/CMYK JPEG color spaces,
+or EXIF/ICC profile preservation when re-encoding. Transparent PNG sources can
+be composited with the explicit `background:` option above. Raise an issue if
+you need one of the unsupported formats!
 
 Possible future improvements: ICC profile rendering/conversion.
 
@@ -215,7 +238,7 @@ On the bundled 1024x1024 images (Apple M5, median of 15 runs after 20 seconds of
 
 Inputs were loaded before timing, and encoded output was returned in memory; file I/O and PNG loading are excluded. Runtimes were benchmarked sequentially. JRuby used its default JIT on OpenJDK 21.0.10. Spinel was measured separately with the same inputs and timing protocol, using a portable harness with PNG pixels preloaded; its encoded JPEG and decoded pixels matched CRuby byte-for-byte. Results vary with image content, garbage collection, and JIT warmup.
 
-The encoder and decoder use an integer-scaled AAN (Arai-Agui-Nakajima) DCT with fixed-point arithmetic throughout — no Float operations in the hot path. Color space conversion uses fixed-point integer math, and pixel data is stored as packed integers to avoid per-pixel object allocation. TruffleRuby's Graal JIT compiler can optimize these tight integer loops particularly well once warmed up.
+The encoder and decoder use the IJG accurate integer DCT, based on the Loeffler factorization, with fixed-point arithmetic throughout — no Float operations in the hot path. Color space conversion uses fixed-point integer math, and pixel data is stored as packed integers to avoid per-pixel object allocation. TruffleRuby's Graal JIT compiler can optimize these tight integer loops particularly well once warmed up.
 
 ## Example scripts
 
@@ -266,6 +289,19 @@ rake benchmark   # basic benchmark of encoding and decoding (5 runs after warmup
 rake profile     # CPU profile with StackProf (requires the stackprof gem)
 ```
 
+The Minitest suite lives in `test/minitest/`; `rake` and `rake test` run it
+with SimpleCov as before. To run one file:
+
+```sh
+bundle exec rake test TEST=test/minitest/test_raw_source.rb
+```
+
+With Spinel and Spin installed, `spin test` runs the standalone package checks
+in `test/*.rb`, comparing their output with CRuby. These cover color/grayscale
+round trips, metadata, and invalid input; they supplement the full Minitest
+suite. See [test/SPINEL.md](test/SPINEL.md) for details and the existing
+`rake test:spinel` runner.
+
 ## Full benchmark script
 
 `benchmark/run.rb` is a more thorough benchmark that exercises the encode and decode paths in several ways. It auto-enables YJIT, warms up before measuring, and reports object allocations, throughput (iterations/second via `benchmark-ips`), best-of-N wall-clock times, and a sustained mixed workload across encode (q85, q95 optimized, grayscale) and decode (baseline and progressive).
@@ -301,4 +337,6 @@ ruby benchmark/run.rb --profile-alloc  # retained-object profile with Vernier
 
 ## License
 
-MIT
+MIT, with IJG terms for the adapted integer DCT implementation. This software
+is based in part on the work of the Independent JPEG Group. See [LICENSE](LICENSE)
+and [LICENSE-IJG](LICENSE-IJG) for the notices and adaptation details.

data/lib/pure_jpeg/bit_reader.rb

@@ -35,6 +35,26 @@ module PureJPEG
       @buffer = 0
     end
 
+    # Consume exactly the restart expected at an MCU boundary. Marker fill
+    # bytes are allowed; entropy bytes and out-of-sequence restarts are not.
+    def read_restart(expected)
+      reset
+      unless @data.getbyte(@pos) == 0xFF
+        raise DecodeError, "Missing JPEG restart marker"
+      end
+      @pos += 1 while @pos < @length && @data.getbyte(@pos) == 0xFF
+      unless @data.getbyte(@pos) == 0xD0 + expected
+        raise DecodeError, "Unexpected JPEG restart marker (expected RST#{expected})"
+      end
+      @pos += 1
+    end
+
+    def finish_scan!
+      # Remaining bits in the last byte are padding, but whole unread bytes
+      # indicate extra entropy data or an unexpected trailing restart marker.
+      raise DecodeError, "Extra data after JPEG scan" unless @pos == @length
+    end
+
     # Read additional bits and sign-extend per JPEG spec (receive/extend).
     def receive_extend(size)
       return 0 if size == 0
@@ -56,10 +76,7 @@ module PureJPEG
         raise PureJPEG::DecodeError, "Unexpected end of scan data" if @pos >= @length
         next_byte = @data.getbyte(@pos)
         @pos += 1
-        # 0xFF 0x00 is a stuffed 0xFF byte
-        # Skip restart markers (0xD0-0xD7)
-        return fill_buffer if next_byte != 0x00 && next_byte >= 0xD0 && next_byte <= 0xD7
-        # For 0x00, the byte is 0xFF (stuffing removed)
+        raise DecodeError, "Unexpected marker in JPEG entropy data" unless next_byte == 0x00
       end
       @buffer = byte
       @bits_in_buffer = 8

data/lib/pure_jpeg/dct.rb

@@ -2,8 +2,10 @@
 
 module PureJPEG
   # Integer-scaled DCT based on the IJG (Independent JPEG Group) reference
-  # implementation (jfdctint.c / jidctint.c). Uses the Arai-Agui-Nakajima
-  # factorization with 13-bit fixed-point constants.
+  # implementation (jfdctint.c / jidctint.c). Uses the Loeffler-based accurate
+  # integer factorization with 13-bit fixed-point constants. The upstream
+  # copyright and distribution terms are included in LICENSE-IJG; adaptation
+  # details are recorded in LICENSE.
   #
   # All arithmetic is pure Integer (additions, shifts, multiplies) — no Float
   # operations. This is ~3x faster than the matrix-multiply float DCT under

data/lib/pure_jpeg/decoder.rb

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
 module PureJPEG
-  # Baseline JPEG decoder.
+  # Baseline and progressive JPEG decoder.
   #
-  # Decodes baseline DCT (SOF0) JPEGs with 1 or 3 components, any chroma
-  # subsampling factor, and restart markers.
+  # Decodes baseline (SOF0) and progressive (SOF2) 8-bit grayscale/YCbCr
+  # JPEGs, including separate component scans and restart markers.
   #
   # Use {PureJPEG.read} for a convenient entry point.
   class Decoder
@@ -13,7 +13,7 @@ module PureJPEG
     # @param path_or_data [String] a file path or raw JPEG bytes
     # @return [Image] decoded image with pixel access
     def self.decode(path_or_data)
-      data = if path_or_data.is_a?(String) && !path_or_data.start_with?("\xFF\xD8".b) && File.exist?(path_or_data)
+      data = if path_or_data.is_a?(String) && !path_or_data.b.include?("\0") && !path_or_data.b.start_with?("\xFF\xD8".b) && File.exist?(path_or_data)
                File.binread(path_or_data)
              else
                path_or_data.b
@@ -29,90 +29,74 @@ module PureJPEG
       jfif = JFIFReader.new(@data)
       @icc_profile = jfif.icc_profile
       validate_dimensions!(jfif.width, jfif.height)
+      validate_frame_and_scans!(jfif)
       return decode_progressive(jfif) if jfif.progressive
 
       width = jfif.width
       height = jfif.height
 
-      # Build Huffman decode tables
-      dc_tables = {}
-      ac_tables = {}
-      jfif.huffman_tables.each do |(table_class, table_id), info|
-        table = Huffman::DecodeTable.new(info[:bits], info[:values])
-        if table_class == 0
-          dc_tables[table_id] = table
-        else
-          ac_tables[table_id] = table
-        end
-      end
-
-      # Map component IDs to their info
       comp_info = {}
       jfif.components.each { |c| comp_info[c.id] = c }
-
-      # Determine max sampling factors
       max_h = jfif.components.map(&:h_sampling).max
       max_v = jfif.components.map(&:v_sampling).max
-
-      # MCU dimensions in pixels
       mcu_px_w = max_h * 8
       mcu_px_h = max_v * 8
       mcus_x = (width + mcu_px_w - 1) / mcu_px_w
       mcus_y = (height + mcu_px_h - 1) / mcu_px_h
 
-      # Allocate channel buffers (full padded size)
-      padded_w = mcus_x * mcu_px_w
-      padded_h = mcus_y * mcu_px_h
       channels = {}
       jfif.components.each do |c|
-        ch_w = (padded_w * c.h_sampling) / max_h
-        ch_h = (padded_h * c.v_sampling) / max_v
+        ch_w = mcus_x * c.h_sampling * 8
+        ch_h = mcus_y * c.v_sampling * 8
         channels[c.id] = { data: Array.new(ch_w * ch_h, 0), width: ch_w, height: ch_h }
       end
-
-      # Decode scan data
-      reader = BitReader.new(jfif.scan_data)
-      prev_dc = Hash.new(0)
-      restart_interval = jfif.restart_interval
-      mcu_count = 0
-
-      # Reusable buffers
       zigzag = Array.new(64, 0)
       dequant = Array.new(64, 0)
 
-      scan_components = jfif.scan_components.map do |sc|
-        comp, dc_tab, ac_tab = resolve_scan_references!(sc, comp_info, dc_tables, ac_tables)
-        [sc, comp, dc_tab, ac_tab, fetch_quant_table!(jfif, comp), channels[comp.id]]
-      end
-
-      mcus_y.times do |mcu_row|
-        mcus_x.times do |mcu_col|
-          # Handle restart interval
-          if restart_interval > 0 && mcu_count > 0 && (mcu_count % restart_interval) == 0
-            reader.reset
-            prev_dc.clear
-          end
-
-          scan_components.each do |sc, comp, dc_tab, ac_tab, qt, ch|
-            comp.v_sampling.times do |bv|
-              comp.h_sampling.times do |bh|
-                # Decode one 8x8 block
-                decode_block(reader, dc_tab, ac_tab, prev_dc, sc.id, zigzag)
-
-                # Inverse pipeline: unzigzag -> dequantize -> IDCT -> level shift
-                Quantization.dequantize_zigzag!(zigzag, qt, dequant)
-                DCT.inverse!(dequant)
+      jfif.scans.each do |scan|
+        dc_tables, ac_tables = build_decode_tables(scan)
+        reader = BitReader.new(scan.data)
+        prev_dc = Hash.new(0)
+        restart_interval = scan.restart_interval
+        mcu_count = 0
+        interleaved = scan.components.length > 1
+        scan_components = scan.components.map do |sc|
+          comp, dc_tab, ac_tab = resolve_scan_references!(sc, comp_info, dc_tables, ac_tables)
+          [sc, comp, dc_tab, ac_tab, fetch_quant_table!(jfif, comp), channels[comp.id]]
+        end
+        if interleaved
+          scan_width = mcus_x
+          scan_height = mcus_y
+        else
+          comp = scan_components[0][1]
+          scan_width = (width * comp.h_sampling + mcu_px_w - 1) / mcu_px_w
+          scan_height = (height * comp.v_sampling + mcu_px_h - 1) / mcu_px_h
+        end
 
-                # Write block into channel buffer
-                bx = (mcu_col * comp.h_sampling + bh) * 8
-                by = (mcu_row * comp.v_sampling + bv) * 8
-                write_block(dequant, ch[:data], ch[:width], bx, by)
+        scan_height.times do |mcu_row|
+          scan_width.times do |mcu_col|
+            if restart_interval > 0 && mcu_count > 0 && (mcu_count % restart_interval) == 0
+              reader.read_restart((mcu_count / restart_interval - 1) % 8)
+              prev_dc.clear
+            end
+            scan_components.each do |sc, comp, dc_tab, ac_tab, qt, ch|
+              block_rows = interleaved ? comp.v_sampling : 1
+              block_cols = interleaved ? comp.h_sampling : 1
+              block_rows.times do |bv|
+                block_cols.times do |bh|
+                  decode_block(reader, dc_tab, ac_tab, prev_dc, sc.id, zigzag)
+                  Quantization.dequantize_zigzag!(zigzag, qt, dequant)
+                  DCT.inverse!(dequant)
+                  bx = (mcu_col * block_cols + bh) * 8
+                  by = (mcu_row * block_rows + bv) * 8
+                  write_block(dequant, ch[:data], ch[:width], bx, by)
+                end
               end
             end
+            mcu_count += 1
           end
-
-          mcu_count += 1
         end
+        reader.finish_scan!
       end
 
       # Assemble pixels
@@ -128,7 +112,85 @@ module PureJPEG
 
     private
 
+    def build_decode_tables(scan)
+      dc_tables = {}
+      ac_tables = {}
+      scan.huffman_tables.each do |(table_class, table_id), info|
+        table = Huffman::DecodeTable.new(info[:bits], info[:values])
+        if table_class == 0
+          dc_tables[table_id] = table
+        else
+          ac_tables[table_id] = table
+        end
+      end
+      [dc_tables, ac_tables]
+    end
+
+    def validate_frame_and_scans!(jfif)
+      unless jfif.precision == 8
+        raise DecodeError, "Unsupported JPEG precision: #{jfif.precision}"
+      end
+      count = jfif.components.length
+      unless count == 1 || count == 3
+        raise DecodeError, "Unsupported number of components: #{count}"
+      end
+      ids = jfif.components.map(&:id)
+      if count == 3 && (jfif.adobe_transform == 0 || ids.sort == [66, 71, 82])
+        raise DecodeError, "RGB JPEG decoding is unsupported"
+      end
+      if jfif.adobe_transform && ![0, 1].include?(jfif.adobe_transform)
+        raise DecodeError, "Unsupported Adobe color transform: #{jfif.adobe_transform}"
+      end
+      raise DecodeError, "JPEG scan data not found" if jfif.scans.empty?
+
+      progression = {}
+      ids.each { |id| progression[id] = Array.new(64) }
+      jfif.scans.each do |scan|
+        scan_ids = scan.components.map(&:id)
+        if scan_ids.empty? || scan_ids.uniq.length != scan_ids.length
+          raise DecodeError, "Invalid JPEG scan components"
+        end
+        scan_ids.each do |id|
+          raise DecodeError, "Scan references unknown component id #{id}" unless progression.key?(id)
+        end
+        if scan_ids.length > 1
+          blocks = jfif.components.select { |c| scan_ids.include?(c.id) }.sum { |c| c.h_sampling * c.v_sampling }
+          raise DecodeError, "Too many blocks in JPEG MCU" if blocks > 10
+        end
+
+        ss = scan.spectral_start
+        se = scan.spectral_end
+        ah = scan.successive_high
+        al = scan.successive_low
+        if jfif.progressive
+          valid = ss <= se && se <= 63 && ah <= 13 && al <= 13 &&
+                  (ss == 0 ? se == 0 : scan_ids.length == 1) &&
+                  (ah == 0 || al == ah - 1)
+          raise DecodeError, "Invalid progressive scan parameters" unless valid
+        elsif ss != 0 || se != 63 || ah != 0 || al != 0
+          raise DecodeError, "Invalid baseline scan parameters"
+        end
+        scan_ids.each do |id|
+          state = progression[id]
+          if ss > 0 && state[0].nil?
+            raise DecodeError, "Progressive AC scan precedes DC scan"
+          end
+          ss.upto(se) do |k|
+            unless ah == 0 ? state[k].nil? : state[k] == ah
+              raise DecodeError, "Invalid JPEG scan progression"
+            end
+            state[k] = al
+          end
+        end
+      end
+      if progression.values.any? { |state| state[0].nil? }
+        raise DecodeError, "JPEG scan omits a frame component"
+      end
+      jfif.components.each { |c| fetch_quant_table!(jfif, c) }
+    end
+
     def validate_dimensions!(width, height)
+      raise DecodeError, "JPEG frame header not found" unless width && height
       raise DecodeError, "Invalid image dimensions: #{width}x#{height}" if width <= 0 || height <= 0
       raise DecodeError, "Image too large: #{width}x#{height} (max #{MAX_DIMENSION}x#{MAX_DIMENSION})" if width > MAX_DIMENSION || height > MAX_DIMENSION
     end
@@ -157,12 +219,15 @@ module PureJPEG
         bx = mcus_x * c.h_sampling
         by = mcus_y * c.v_sampling
         coeffs[c.id] = Array.new(bx * by * 64, 0)
-        comp_blocks[c.id] = [bx, by]
+        actual_bx = (width * c.h_sampling + mcu_px_w - 1) / mcu_px_w
+        actual_by = (height * c.v_sampling + mcu_px_h - 1) / mcu_px_h
+        # Interleaved scans include MCU padding; single-component scans do not.
+        # Keep the storage stride separate from the actual scan dimensions.
+        comp_blocks[c.id] = [bx, by, actual_bx, actual_by]
       end
 
-      restart_interval = jfif.restart_interval
-
       jfif.scans.each do |scan|
+        restart_interval = scan.restart_interval
         # Build Huffman tables from this scan's snapshot (tables change between scans)
         dc_tables = {}
         ac_tables = {}
@@ -188,6 +253,7 @@ module PureJPEG
           prog_scan_interleaved(reader, scan, comp_info, dc_tables, ac_tables,
                                 coeffs, comp_blocks, mcus_x, mcus_y, restart_interval, ss, se, ah, al)
         end
+        reader.finish_scan!
       end
 
       # Reconstruct: unzigzag/dequantize, IDCT, write to channel buffers
@@ -231,18 +297,20 @@ module PureJPEG
     def prog_scan_non_interleaved(reader, scan, comp_info, dc_tables, ac_tables,
                                   coeffs, comp_blocks, restart_interval, ss, se, ah, al)
       sc = scan.components[0]
-      comp, dc_tab, ac_tab = resolve_scan_references!(sc, comp_info, dc_tables, ac_tables, require_ac: ss > 0)
+      comp, dc_tab, ac_tab = resolve_scan_references!(sc, comp_info, dc_tables, ac_tables,
+                                                    require_dc: ss == 0 && ah == 0, require_ac: ss > 0)
       coeff_buf = coeffs[comp.id]
-      bx_count, by_count = comp_blocks[comp.id]
+      bx_count, _by_count, actual_bx, actual_by = comp_blocks[comp.id]
 
       prev_dc = 0
       eobrun = 0
       mcu_count = 0
 
-      by_count.times do |block_y|
-        bx_count.times do |block_x|
+      actual_by.times do |block_y|
+        actual_bx.times do |block_x|
           if restart_interval > 0 && mcu_count > 0 && (mcu_count % restart_interval) == 0
-            reader.reset
+            raise DecodeError, "Progressive EOB run crosses restart boundary" if eobrun > 0
+            reader.read_restart((mcu_count / restart_interval - 1) % 8)
             prev_dc = 0
             eobrun = 0
           end
@@ -266,6 +334,7 @@ module PureJPEG
           mcu_count += 1
         end
       end
+      raise DecodeError, "Progressive EOB run exceeds scan" if eobrun > 0
     end
 
     def prog_scan_interleaved(reader, scan, comp_info, dc_tables, ac_tables,
@@ -274,14 +343,15 @@ module PureJPEG
       mcu_count = 0
 
       scan_components = scan.components.map do |sc|
-        comp, dc_tab = resolve_scan_references!(sc, comp_info, dc_tables, ac_tables, require_ac: false)
+        comp, dc_tab = resolve_scan_references!(sc, comp_info, dc_tables, ac_tables,
+                                              require_dc: ah == 0, require_ac: false)
         [sc, comp, dc_tab, coeffs[comp.id], comp_blocks[comp.id][0]]
       end
 
       mcus_y.times do |mcu_row|
         mcus_x.times do |mcu_col|
           if restart_interval > 0 && mcu_count > 0 && (mcu_count % restart_interval) == 0
-            reader.reset
+            reader.read_restart((mcu_count / restart_interval - 1) % 8)
             prev_dc.clear
           end
 
@@ -330,6 +400,7 @@ module PureJPEG
         if size == 0
           if run == 15
             k += 16
+            raise DecodeError, "AC run exceeds spectral band" if k > se + 1
           else
             # EOBn
             eobrun = (1 << run)
@@ -338,6 +409,7 @@ module PureJPEG
           end
         else
           k += run
+          raise DecodeError, "AC run exceeds spectral band" if k > se
           coeff_buf[offset + k] = reader.receive_extend(size) << al
           k += 1
         end
@@ -367,6 +439,7 @@ module PureJPEG
         # (the value bits come before refinement bits in the bitstream)
         new_value = nil
         if s != 0
+          raise DecodeError, "Invalid progressive AC refinement symbol" unless s == 1
           new_value = reader.receive_extend(s) << al
         elsif r != 15
           # EOBn: refine remaining nonzero coefficients in this block
@@ -393,7 +466,8 @@ module PureJPEG
         end
 
         # Place new coefficient at the target zero position
-        if new_value && k <= se
+        raise DecodeError, "AC refinement run exceeds spectral band" if k > se
+        if new_value
           coeff_buf[offset + k] = new_value
         end
         k += 1
@@ -429,6 +503,7 @@ module PureJPEG
           end
           break
         elsif symbol == 0xF0 # ZRL (16 zeros)
+          raise DecodeError, "AC run exceeds block" if i + 16 > 64
           16.times do
             out[i] = 0
             i += 1
@@ -436,6 +511,8 @@ module PureJPEG
         else
           run = (symbol >> 4) & 0x0F
           size = symbol & 0x0F
+          raise DecodeError, "Invalid baseline AC symbol" if size == 0
+          raise DecodeError, "AC run exceeds block" if i + run >= 64
           run.times do
             out[i] = 0
             i += 1
@@ -464,12 +541,14 @@ module PureJPEG
       end
     end
 
-    def resolve_scan_references!(scan_component, comp_info, dc_tables, ac_tables, require_ac: true)
+    def resolve_scan_references!(scan_component, comp_info, dc_tables, ac_tables, require_dc: true, require_ac: true)
       comp = comp_info[scan_component.id]
       raise DecodeError, "Scan references unknown component id #{scan_component.id}" unless comp
 
       dc_tab = dc_tables[scan_component.dc_table_id]
-      raise DecodeError, "Component #{scan_component.id} references missing DC Huffman table #{scan_component.dc_table_id}" unless dc_tab
+      if require_dc && !dc_tab
+        raise DecodeError, "Component #{scan_component.id} references missing DC Huffman table #{scan_component.dc_table_id}"
+      end
 
       if require_ac
         ac_tab = ac_tables[scan_component.ac_table_id]
@@ -480,7 +559,7 @@ module PureJPEG
     end
 
     def fetch_quant_table!(jfif, comp)
-      qt = jfif.quant_tables[comp.qt_id]
+      qt = jfif.component_quant_tables[comp.id]
       raise DecodeError, "Component #{comp.id} references missing quantization table #{comp.qt_id}" unless qt
 
       qt
@@ -521,6 +600,8 @@ module PureJPEG
       cb_data = cb_ch[:data]
       cr_data = cr_ch[:data]
       y_stride = y_ch[:width]
+      y_h = y_comp.h_sampling
+      y_v = y_comp.v_sampling
       cb_stride = cb_ch[:width]
       cr_stride = cr_ch[:width]
       cb_h = cb_comp.h_sampling
@@ -532,14 +613,14 @@ module PureJPEG
 
       height.times do |py|
         dst_row = py * width
-        y_row = py * y_stride
+        y_row = ((py * y_v) / max_v) * y_stride
 
         # Chroma coordinates (nearest-neighbor upsampling)
         cb_row = ((py * cb_v) / max_v) * cb_stride
         cr_row = ((py * cr_v) / max_v) * cr_stride
 
         width.times do |px|
-          lum = y_data[y_row + px]
+          lum = y_data[y_row + (px * y_h) / max_h]
 
           cb_x = (px * cb_h) / max_h
           cr_x = (px * cr_h) / max_h

data/lib/pure_jpeg/huffman/decoder.rb

@@ -4,6 +4,16 @@ module PureJPEG
   module Huffman
     class DecodeTable
       def initialize(bits, values)
+        unless bits.length == 16 && bits.all? { |n| n.is_a?(Integer) && n.between?(0, 255) } &&
+               values.length.between?(1, 256) && bits.sum == values.length
+          raise DecodeError, "Invalid JPEG Huffman table lengths"
+        end
+        available = 1
+        bits.each do |count|
+          available = available * 2 - count
+          # JPEG reserves the all-ones code for entropy padding.
+          raise DecodeError, "Oversubscribed JPEG Huffman table" if available <= 0
+        end
         @min_code = Array.new(17, 0)
         @max_code = Array.new(17, -1)
         @val_ptr = Array.new(17, 0)

data/lib/pure_jpeg/jfif_reader.rb

@@ -3,19 +3,24 @@
 module PureJPEG
   class JFIFReader
     attr_reader :width, :height, :components, :quant_tables, :huffman_tables,
-                :restart_interval, :progressive, :scans, :icc_profile
+                :restart_interval, :progressive, :scans, :icc_profile,
+                :precision, :adobe_transform, :component_quant_tables
 
     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)
+    Scan = Struct.new(:components, :spectral_start, :spectral_end, :successive_high, :successive_low, :data, :huffman_tables) do
+      attr_accessor :restart_interval
+    end
 
-    def initialize(data, stop_after_frame: false)
+    def initialize(data, stop_after_frame: false, metadata_only: false)
       @data = data.b
       @stop_after_frame = stop_after_frame
+      @metadata_only = metadata_only
       @pos = 0
       @quant_tables = {}
       @huffman_tables = {}
       @components = []
+      @component_quant_tables = {}
       @restart_interval = 0
       @progressive = false
       @scans = []
@@ -38,16 +43,20 @@ module PureJPEG
       expect_marker(0xD8) # SOI
 
       loop do
+        # Header-only input is useful for metadata queries, even without SOS.
+        return if @metadata_only && @width && @pos == @data.bytesize
         marker = read_marker
         case marker
         when 0xE2 # APP2 (may contain ICC profile)
           parse_app2
-        when 0xE0, 0xE1, 0xE3..0xEF # APP0, APP1, APP3-APP15
+        when 0xEE # Adobe APP14
+          parse_app14
+        when 0xE0, 0xE1, 0xE3..0xED, 0xEF # Other application markers
           skip_segment
         when 0xDB # DQT
-          parse_dqt
+          @metadata_only ? skip_segment : parse_dqt
         when 0xC4 # DHT
-          parse_dht
+          @metadata_only ? skip_segment : parse_dht
         when 0xC0 # SOF0 (baseline)
           parse_sof0
           return if @stop_after_frame
@@ -56,17 +65,30 @@ module PureJPEG
           @progressive = true
           return if @stop_after_frame
         when 0xDA # SOS
+          return if @metadata_only
           scan = parse_sos
           scan.data = extract_scan_data
           scan.huffman_tables = @huffman_tables.dup
+          scan.restart_interval = @restart_interval
+          # A component keeps the quantizer selected by its first scan, even
+          # if another scan later redefines that table ID for other components.
+          scan.components.each do |sc|
+            comp = @components.find { |c| c.id == sc.id }
+            if comp && !@component_quant_tables.key?(comp.id)
+              @component_quant_tables[comp.id] = @quant_tables[comp.qt_id]
+            end
+          end
           @scans << scan
-          return unless @progressive
         when 0xFE # COM (comment)
           skip_segment
         when 0xDD # DRI (restart interval)
           parse_dri
         when 0xD9 # EOI
           return
+        when 0xC1, 0xC3, 0xC5..0xCB, 0xCD..0xCF
+          raise DecodeError, "Unsupported JPEG frame marker: 0x#{marker.to_s(16)}"
+        when 0xD0..0xD8, 0x00, 0x01
+          raise DecodeError, "Unexpected JPEG marker: 0x#{marker.to_s(16)}"
         else
           skip_segment
         end
@@ -100,13 +122,24 @@ module PureJPEG
 
     ICC_PROFILE_SIG = "ICC_PROFILE\0".b
 
+    def parse_app14
+      end_pos = read_segment_end
+      if end_pos - @pos >= 12 && @data[@pos, 5] == "Adobe"
+        @adobe_transform = @data.getbyte(@pos + 11)
+      end
+      @pos = end_pos
+    end
+
     def parse_app2
       end_pos = read_segment_end
 
       if (end_pos - @pos) >= 14 && @data[@pos, 12] == ICC_PROFILE_SIG
         @pos += 12
         seq_no = read_byte
-        _total = read_byte
+        total = read_byte
+        @icc_invalid = true if total == 0 || seq_no == 0 || seq_no > total ||
+                               (@icc_total && @icc_total != total) || @icc_chunks.key?(seq_no)
+        @icc_total = total
         @icc_chunks[seq_no] = @data[@pos, end_pos - @pos]
       end
 
@@ -115,6 +148,7 @@ module PureJPEG
 
     def assemble_icc_profile
       return if @icc_chunks.empty?
+      return if @icc_invalid || @icc_chunks.length != @icc_total
 
       @icc_profile = @icc_chunks.sort_by(&:first).map(&:last).join.b
     end
@@ -130,6 +164,9 @@ module PureJPEG
         info = read_byte
         precision = (info >> 4) & 0x0F  # 0 = 8-bit, 1 = 16-bit
         table_id = info & 0x0F
+        unless precision <= 1 && table_id <= 3
+          raise DecodeError, "Invalid JPEG quantization table definition"
+        end
         bytes_per_value = precision == 0 ? 1 : 2
         ensure_remaining_in_segment!(end_pos, 64 * bytes_per_value, "DQT")
 
@@ -137,6 +174,7 @@ module PureJPEG
         64.times do |i|
           zigzag_table[i] = precision == 0 ? read_byte : read_u16
         end
+        raise DecodeError, "Zero JPEG quantization value" if zigzag_table.include?(0)
         # DQT stores values in zigzag order; convert to raster order
         table = Array.new(64)
         64.times { |i| table[Zigzag::ORDER[i]] = zigzag_table[i] }
@@ -152,20 +190,27 @@ module PureJPEG
         info = read_byte
         table_class = (info >> 4) & 0x0F  # 0 = DC, 1 = AC
         table_id = info & 0x0F
+        unless table_class <= 1 && table_id <= 3
+          raise DecodeError, "Invalid JPEG Huffman table definition"
+        end
 
         bits = Array.new(16) { read_byte }
         total = bits.sum
         ensure_remaining_in_segment!(end_pos, total, "DHT")
         values = Array.new(total) { read_byte }
+        if values.any? { |value| table_class == 0 ? value > 11 : (value & 15) > 10 }
+          raise DecodeError, "Invalid JPEG Huffman symbol"
+        end
 
         @huffman_tables[[table_class, table_id]] = { bits: bits, values: values }
       end
     end
 
     def parse_sof0
+      raise DecodeError, "Multiple JPEG frame headers are unsupported" if @width
       end_pos = read_segment_end
       ensure_remaining_in_segment!(end_pos, 6, "SOF")
-      read_byte # precision (always 8 for baseline)
+      @precision = read_byte
       @height = read_u16
       @width = read_u16
       num_components = read_byte
@@ -179,6 +224,13 @@ module PureJPEG
         qt_id = read_byte
         Component.new(id, h, v, qt_id)
       end
+      raise DecodeError, "JPEG frame has no components" if @components.empty?
+      if @components.map(&:id).uniq.length != @components.length
+        raise DecodeError, "Duplicate JPEG component id"
+      end
+      unless @components.all? { |c| c.h_sampling.between?(1, 4) && c.v_sampling.between?(1, 4) }
+        raise DecodeError, "Invalid JPEG sampling factors"
+      end
       @pos = end_pos
     end
 
@@ -234,19 +286,23 @@ module PureJPEG
     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 < len - 1
+      # Preserve the first FF of a marker's fill run for read_marker. Stuffed
+      # bytes and restarts belong to the entropy stream, segment markers do not.
+      while @pos < len
         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
+        raise DecodeError, "Unexpected end of JPEG scan" unless found
+        marker_pos = found + 1
+        marker_pos += 1 while marker_pos < len && @data.getbyte(marker_pos) == 0xFF
+        raise DecodeError, "Unexpected end of JPEG scan" if marker_pos == len
+        code = @data.getbyte(marker_pos)
+        if code == 0x00 || code.between?(0xD0, 0xD7)
+          @pos = marker_pos + 1
+        else
+          @pos = found
+          return @data[start...found]
         end
-        @pos += 2
       end
-      @data[start...@pos]
+      raise DecodeError, "Unexpected end of JPEG scan"
     end
   end
 end

data/lib/pure_jpeg/version.rb

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

data/lib/pure_jpeg.rb

@@ -21,10 +21,9 @@ require_relative "pure_jpeg/image"
 require_relative "pure_jpeg/encoder"
 require_relative "pure_jpeg/decoder"
 
-  # Pure Ruby JPEG encoder and decoder with no native dependencies.
-  #
-  # Supports baseline DCT (SOF0) with 8-bit precision, grayscale and YCbCr
-  # color (4:2:0 chroma subsampling), and standard Huffman tables (Annex K).
+# Pure Ruby JPEG encoder and decoder with no native dependencies.
+# Encodes baseline DCT (SOF0), and decodes baseline and progressive (SOF2)
+# 8-bit grayscale and YCbCr JPEGs.
 module PureJPEG
   # Raised when decoding invalid or unsupported JPEG data.
   class DecodeError < StandardError; end
@@ -70,15 +69,15 @@ module PureJPEG
   # 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
+  # @return [Info] frame metadata and complete ICC profile from headers before SOS
   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)
+    data = if path_or_data.is_a?(String) && !path_or_data.b.include?("\0") && !path_or_data.b.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)
+    jfif = JFIFReader.new(data, metadata_only: true)
     raise DecodeError, "JPEG frame header not found" unless jfif.width && jfif.height
 
     Info.new(

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pure_jpeg
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Peter Cooper
@@ -37,7 +37,8 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
-description: A pure Ruby baseline JPEG encoder and decoder with no native dependencies.
+description: A pure Ruby baseline JPEG encoder and baseline/progressive JPEG decoder
+  with no native dependencies.
 email:
 - git@peterc.org
 executables: []
@@ -45,7 +46,9 @@ extensions: []
 extra_rdoc_files: []
 files:
 - CHANGELOG.md
+- CREATIVE.md
 - LICENSE
+- LICENSE-IJG
 - README.md
 - lib/pure_jpeg.rb
 - lib/pure_jpeg/bit_reader.rb
@@ -69,6 +72,7 @@ files:
 homepage: https://github.com/peterc/pure_jpeg
 licenses:
 - MIT
+- IJG
 metadata:
   source_code_uri: https://github.com/peterc/pure_jpeg
   changelog_uri: https://github.com/peterc/pure_jpeg/blob/main/CHANGELOG.md