mirror of
https://github.com/storytold/craft-libs.git
synced 2026-11-18 23:32:45 +00:00
b130ac1fa4
* image-codecs: find the JPEG-LS frame header past 64 segments, and add detect_prefix detect walked at most 64 marker segments looking for the SOF55 frame header, so a JPEG-LS file with more segments before its frame header, such as an ICC profile split over 255 APP2 segments, was reported as JPEG. The walk now runs until it reaches a frame or scan header or the end of the bytes. Each step moves forward at least one byte, so the walk takes at most one step per byte. detect also reported JPEG for a buffer that ended before the frame header, which is what a caller that reads only the start of a file passes. The new detect_prefix returns Detection::NeedBytes(n) in that case, with the length the next step reads, and otherwise the answer detect gives. The doc comment on detect now says that it needs the bytes up to the frame header. * image-codecs: walk each JPEG marker segment once when detecting in steps detect_prefix walks the marker segments from the SOI on every call, so a caller that reads exactly the length each Detection::NeedBytes asks for walks the earlier segments again on each call. Over a file with many small segments before its frame header, the total walk grows with the square of the segment count. The new PrefixDetector keeps the offset of the marker where its last walk stopped and starts the next walk there. Its detect gives the same answer and asks for the same lengths as detect_prefix, and detect_prefix now runs a single step of a new PrefixDetector. * image-codecs: read past a JPEG-LS restart interval segment and stop at FF 00 The JPEG-LS frame walk treated a DRI segment before the SOF55 frame header as the end of the walk, so a file with one was detected and decoded as JPEG. DRI now takes the length-prefixed path. The decoder accepts a 2-, 3- or 4-byte interval of 0, reports a nonzero interval as unsupported, and rejects other segment sizes as malformed. `FF 00` after the SOI is a stuffed zero, not a marker, so the walk now ends there instead of asking for a length field. A PrefixDetector whose walk stopped at another frame header answers JPEG for bytes that start with `FF D8 FF`, without walking from the SOI again. * image-codecs: apply the JPEG-LS restart interval in effect at each scan A later DRI with an interval of 0 turns restarts off again, and an interval of at least the frame height puts a non-interleaved scan in one interval with no restart marker. Both decode again. A nonzero interval shorter than the frame height is still unsupported. * image-codecs: reject a restart marker after a JPEG-LS scan of one interval A restart marker comes only between two restart intervals. When the interval in effect is at least the frame height, the scan is one interval, so a restart marker after it, with or without fill bytes before it, is now an error instead of being skipped. Adds a test that a PrefixDetector starts each call at the marker where its previous walk stopped.