Commit Graph
129 Commits
Author SHA1 Message Date
FredApps a58989cae9 image-codecs: skip a SubIFDs array whose offset is cut off (#1889)
camera_raw_mode read a missing SubIFDs offset as 0, so it walked the TIFF
header as the pointer array and could classify a malformed TIFF as RAW.
Skip the entry instead, matching LightCraft's classifier.
2026-11-16 10:26:36 -05:00
FredApps dd345db898 image-codecs: read a raster's resolution from its headers (resolution_probe) (#1838)
* image-codecs: read a raster's resolution from its headers (resolution_probe)

file_resolution(bytes) gives the pixels per inch a JPEG, PNG, WebP, BMP or
classic TIFF records without decoding pixels. JPEG uses the decoder's marker
scan (Photoshop, XMP, EXIF, then JFIF), PNG reads pHYs as the decoder does and
falls back to eXIf, WebP its EXIF chunk, TIFF its IFD0 tags; BMP reads the
info header's pixels per metre. Values outside 1-100000 ppi count as none.

DesignCraft (crates/images/src/resolution.rs) and FigCraft
(crates/format/src/density.rs) each carry their own marker and chunk walkers
for this; they can switch to the shared probe.

Part of #778 and #785.

* image-codecs: resolution_probe reads only a whole nine-byte pHYs, and a zero one leaves eXIf

A pHYs chunk that declares any other length, or is cut off before its
CRC, records nothing, and its data is no longer read from the bytes
after it. A zero pixels-per-metre count records nothing either, as in the
decoder, so the eXIf resolution still answers.
2026-11-16 08:14:38 -05:00
Dylan M. Taylor 731c4f262a Merge pull request #1758 from dotCooCoo/fix/exr-deep-part-tables-end
craft-exr: deep chunk offsets start after every part's offset table
2026-11-16 05:46:49 -05:00
Dylan M. Taylor 8a83e9178d Merge pull request #1837 from ljkx/image-codecs-bmp-resolution
image-codecs: BMP keeps its resolution in the header's pixels per metre
2026-11-16 05:45:26 -05:00
ljkx 7adcc9a6c2 image-codecs: BMP keeps its resolution in the header's pixels per metre
A BMP stores its resolution in biXPelsPerMeter and biYPelsPerMeter
(BITMAPINFOHEADER and later). The image crate writes 0 there and nothing
read the fields, so a 300 ppi image saved as BMP reopened at 72 ppi and an
opened BMP's resolution was lost (storytold/photocraft#13630).

decode now reads the fields into Metadata::dpi, encode writes
Metadata::dpi into them whatever embed_metadata says, and
caps(Format::Bmp).dpi is true. encode_bmp_indexed_with_dpi is the palette
writer with a resolution; encode_bmp_indexed keeps its signature and output.
2026-11-16 10:05:03 +01:00
FredApps e8aed7cfa6 image-codecs: find the JPEG EXIF APP1 by walking segments and bound the copy by its length
An Exif signature inside a COM segment was taken for the EXIF APP1, and the copy was checked
only against the end of the file, so a replacement longer than the APP1 overwrote the next
marker. Walk the header segments to the first EXIF APP1 and copy only within its declared length.
2026-11-16 08:30:28 +01:00
FredApps 3c78b4d670 Merge remote-tracking branch 'origin/main' into w1646
# Conflicts:
#	crates/image-codecs/src/codecs/jpeg.rs
#	crates/image-codecs/src/lib.rs
2026-11-16 06:48:43 +01:00
FredApps a499742a93 Merge pull request #1779 from storytold/image-codecs/jpeg-stored-inks
feat(image-codecs): read four-component JPEGs as stored inks
2026-11-16 04:48:49 +01:00
FredApps 9baecfa4a1 Merge origin/main; route frames zune-jpeg may panic on to craft-jpeg where panics abort
On panic = "abort" targets (wasm32) the catch_unwind fallback can't run, so
frames whose first component is sampled below the frame's largest factors
go to craft-jpeg before zune-jpeg is called.
2026-11-16 02:54:50 +01:00
FredApps c28356d400 Merge pull request #1660 from storytold/codex/legacy-exif-orientation
Share legacy EXIF summary and preserve PNG orientation
2026-11-16 02:48:31 +01:00
FredApps 5b5f42961c Merge pull request #1672 from storytold/codex/sunraster-main-reconcile
craft-image-codecs: add opt-in Sun Raster reader and writer
2026-11-16 02:41:41 +01:00
FredApps 4a70763629 fix(image-codecs): refuse JPEG inks of frames too large for their scan data
zune-jpeg allocates its whole output before reading a scan, so
decode_jpeg_inks now applies decode's scan-data guard (one byte for every
2048 pixels, counted on scan data, not APP padding) first. The comparison
test's noise is computed in u64, so it doesn't overflow on 32-bit targets.
2026-11-16 02:39:34 +01:00
FredApps 832883b5b4 Merge pull request #1755 from storytold/image-codecs/probe-size-png-jpeg-tiff
image-codecs: probe PNG, JPEG and TIFF sizes from the header
2026-11-16 02:38:50 +01:00
FredApps fc1801a3aa Merge remote-tracking branch 'origin/main' into image-codecs/jpeg-zune-panic 2026-11-16 01:33:19 +01:00
FredApps 12fdc6571f Merge remote-tracking branch 'origin/main' into w1672 2026-11-16 01:27:27 +01:00
FredApps 1b71cd1c18 Merge pull request #1667 from storytold/codex/sgi-main-reconcile
Reconcile SGI codec with merged JPEG-LS support
2026-11-16 01:26:24 +01:00
FredApps a5a713d2e6 Merge remote-tracking branch 'origin/main' into image-codecs/jpeg-stored-inks 2026-11-16 01:21:38 +01:00
FredApps 3d09cb9ab9 Merge remote-tracking branch 'origin/main' into w-r-codex/legacy-exif-orientation 2026-11-16 01:15:06 +01:00
FredApps 159d7134d0 fix(image-codecs): read the JPEGs zune-jpeg panics on with craft-jpeg
zune-jpeg 0.5 asserts in its upsampler on some subsampled four-component
frames whose first component isn't the largest. decode now catches that
panic and reads the file with craft-jpeg, as it reads arithmetic-coded and
12-bit files. Refs #778.
2026-11-16 01:13:19 +01:00
FredApps 2d4b8b8ecd Merge pull request #1679 from storytold/codex/avif-source-depth
Expose source bit depth from AVIF decode
2026-11-16 01:11:58 +01:00
FredApps a61b1ad53c fix(image-codecs): JPEG inks of frames zune-jpeg panics on are an error 2026-11-16 01:05:44 +01:00
FredApps aa9ecc2be4 Merge pull request #1668 from storytold/codex/shared-raw-tiff-hint
Share legacy TIFF camera RAW classification
2026-11-16 00:54:25 +01:00
FredApps d0bba656d1 Merge remote-tracking branch 'origin/codex/legacy-exif-orientation' into w-1613
# Conflicts:
#	crates/image-codecs/src/lib.rs
2026-11-16 00:53:34 +01:00
FredApps 927eabc6e6 feat(image-codecs): a JPEG's declared size from its headers, as zune-jpeg reads them 2026-11-16 00:52:35 +01:00
FredApps a6c3feafd9 Merge remote-tracking branch 'origin/codex/legacy-exif-orientation' into w-1668 2026-11-16 00:50:40 +01:00
FredApps 473753b58c feat(image-codecs): read four-component JPEGs as stored inks
A jpeg_inks module for apps that keep a CMYK JPEG's inks the way zune-jpeg
readers gave them: every four-component file taken as Adobe-inverted, YCCK
turned into CMYK as libjpeg does (truncating), only the 8-bit Huffman frames
zune-jpeg decodes (arithmetic-coded and 12-bit files are refused), within
Limits. Also the frame's component count and the assembled ICC profile from
the headers alone. Refs #778.
2026-11-16 00:44:58 +01:00
FredApps 010d1c1f00 Merge remote-tracking branch 'origin/main' into image-codecs/probe-size-png-jpeg-tiff
# Conflicts:
#	crates/image-codecs/src/lib.rs
2026-11-16 00:38:11 +01:00
FredApps 4d4a2c1726 Merge remote-tracking branch 'origin/main' into w-codex/legacy-exif-orientation 2026-11-16 00:26:49 +01:00
FredApps 947dc5fb0e Merge pull request #1630 from storytold/codex/shared-tiff-inspection
Share first-directory TIFF inspection
2026-11-16 00:05:27 +01:00
FredApps f749643b01 Merge pull request #1603 from storytold/codex/raster-probe-limits
Expose bounded stored raster dimensions
2026-11-16 00:01:21 +01:00
FredApps cb3551ad3f Merge pull request #1680 from storytold/fix/jls-low-bit-budget
Fix JPEG-LS low-precision scaling and scan allocation limit
2026-11-15 23:56:48 +01:00
Dylan M. Taylor c28f200060 Integrate merged AVIF decoder safeguards into source-depth API 2026-11-15 17:31:11 -05:00
FredApps 59b4f1e8c2 image-codecs: decode AVIF pixels with the pure-Rust AV1 decoder (#778) (#1601)
* image-codecs: decode AVIF pixels with craft-video's pure-Rust AV1 decoder

New optional `avif-decode` feature (native targets) reads still AVIF
files: the HEIF/ISOBMFF item graph, grids, clap/irot/imir, alpha
auxiliary images (including premultiplied), 8/10/12-bit 4:0:0, 4:2:0,
4:2:2 and 4:4:4, nclx/ICC colour, Exif and XMP, and PQ/HLG to linear
F32 through cicp::linearize as the HEIF path does.

The container walk follows LightCraft #3017 by @emmertex. Every size is
checked against the caller's Limits before the AV1 decoder runs, the
decoder's memory budget is capped by max_alloc, and the decode is
wrapped in catch_unwind so a decoder panic becomes an error.

Fixtures are tiny ffmpeg/libaom files; the 4:2:0 planes match libdav1d
bit for bit. Adds a decode_avif fuzz target.

Part of storytold/craft-libs#778.

* image-codecs, video: address review on the AVIF decoder

- clap: width and height are unsigned fractions, the offsets have signed
  numerators, so 0x80000000/0x40000000 is a width of 2, not -2.
- An item with clap, irot or imir more than once (repeated ipma records)
  is refused before any canvas work, instead of rotating 261120 times.
- Matrix coefficients 10 (BT.2020 constant luminance) is refused rather
  than converted with the non-constant-luminance equations.
- An alpha plane whose own transforms differ from the colour's is refused
  rather than composed in the wrong place; none, or the colour's, still
  decode.
- craft-video: Decoder::set_shown_budget lowers the per-chunk byte cap on
  shown pictures (never above 1 GiB), and the AVIF decoder sets it to
  max_alloc, so a payload of many shown pictures is refused before they
  are built.
2026-11-15 23:25:25 +01:00
FredApps 048c93634a image-codecs: probe PNG, JPEG and TIFF sizes from the header
probe_size returned Unsupported for PNG, JPEG and TIFF, so callers sized
those images with a full decode. Each now reads only its header with the
checks decode runs: PNG's IHDR/fcTL, limits and plausibility; JPEG's
first frame header and EXIF; TIFF's default page directory, camera-raw
refusal and Orientation tag. The size is turned upright for 5-8, as
decode returns it.
2026-11-15 22:15:55 +01:00
dotCooCoo 90b6cbef8a craft-exr: deep chunk offsets must follow every part's offset table
In a multipart file the chunks start after the offset tables of all
parts. The deep readers in craft-exr and craft-image-codecs took the end
of the deep part's own table as the start of the chunk area, so an
offset into a later part's table passed the chunk-area check and its
bytes were parsed as a chunk.

Both readers now compute where the deep part's table starts and where
the last table ends with checked arithmetic, and refuse a file whose
tables run past its end before reading any offsets. The earlier tables'
sizes are no longer capped or saturated.

Tests build a two-part file from scratch (a deep part and a 1x1 flat
part, in both orders): the deep part decodes as in a single-part file,
an offset into the second table or one byte before the end of the
tables is refused, and a file that ends inside the second table is
refused.
2026-11-15 13:13:48 -08:00
Dylan M. Taylor cae7c1d8a6 Share Samsung SEF repair and JPEG EOI inspection (#1640)
* Expose tolerant JPEG marker inspection

* Export JPEG inspection API

* Factor JPEG inspection fields from shared walker

* Share ICC chunk collection between JPEG inspection modes

* Cover JPEG MPF and gain-map inspection

* Expose MPF index inspection for located payloads

* Cover located MPF index parity

* Preserve bounded MPF index directory validation

* Share Samsung SEF repair and JPEG EOI inspection

* Cover JPEG scan byte search
2026-11-15 13:57:49 -05:00
Dylan M. Taylor 4ed217f1bc Share TIFF first-directory preflight between inspection APIs 2026-11-15 18:43:11 +00:00
Dylan M. Taylor e56b4e3cd4 Deduplicate EXIF orientation and ColorSpace through craft-metadata (#1465)
Extract the remaining metadata delegation from #1198 after #1331 landed the raster facade changes. Preserve current image-codecs API, pixel transforms, docs and regression tests; omit unrelated resolution reexports and TIFF cleanup.

Original-change: 1d52e89405
2026-11-15 12:55:47 -05:00
Dylan M. Taylor a6493b48f0 Fix JPEG-LS low-precision expansion and scan allocation cap 2026-11-15 12:38:25 -05:00
Dylan M. Taylor 6325cd286b Test AVIF source depth and decoded-image parity 2026-11-15 17:37:54 +00:00
Dylan M. Taylor a05083e2f0 Expose original AVIF sample depth during decode 2026-11-15 17:37:40 +00:00
Dylan M. Taylor d7696c4c76 Format Sun Raster feature gates 2026-11-15 17:32:45 +00:00
Dylan M. Taylor 741323cbc3 Merge remote-tracking branch 'origin/codex/sgi-main-reconcile' into codex/sunraster-main-reconcile
# Conflicts:
#	crates/image-codecs/README.md
#	crates/image-codecs/src/codecs.rs
#	crates/image-codecs/src/format.rs
#	crates/image-codecs/src/lib.rs
#	crates/image-codecs/tests/it/detect_caps.rs
2026-11-15 17:32:32 +00:00
Dylan M. Taylor c9de09877b Share bounded BMP coverage inspection (#1610) 2026-11-15 12:29:34 -05:00
Dylan M. Taylor 418215d00a Count both merged JPEG-LS and SGI format entries 2026-11-15 17:29:03 +00:00
Dylan M. Taylor 90df9a4d99 Gate SGI codec support behind explicit feature 2026-11-15 17:28:29 +00:00
Dylan M. Taylor 9f18482853 Merge remote-tracking branch 'origin/main' into codex/sgi-main-reconcile
# Conflicts:
#	crates/image-codecs/README.md
#	crates/image-codecs/src/format.rs
#	crates/image-codecs/src/lib.rs
#	crates/image-codecs/tests/it/detect_caps.rs
2026-11-15 17:26:03 +00:00
Dylan M. Taylor 1fb21f0487 Share legacy TIFF RAW classification policy 2026-11-15 17:25:28 +00:00
Dylan M. Taylor b3b8521ab4 Initialize JPEG budget regression limits directly 2026-11-15 17:24:59 +00:00
Dylan M. Taylor f5a22a008c Merge pull request #1576 from el-j/feat/image-codecs-jpegls
craft-image-codecs: JPEG-LS reader and writer
2026-11-15 12:22:57 -05:00