diff options
| author | Carl Hetherington <cth@carlh.net> | 2026-04-22 22:24:09 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2026-04-23 16:51:08 +0200 |
| commit | e54f93bf7d144737df4b0331017164360c9121ff (patch) | |
| tree | ac8bd65231b31c414fd87348587a6dabd97d31d2 /src/lib | |
| parent | 9f828b327e680c322a70883910233337a37e481e (diff) | |
Fix reading of RGB0 images.
We would allocate 3 bytes per pixel instead of 4. I couldn't see a way
to get FFmpeg to tell us about this (unless we used FFmpeg's stride
somehow maybe?)
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/image.cc | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/src/lib/image.cc b/src/lib/image.cc index 95de4bc03..0810fbbea 100644 --- a/src/lib/image.cc +++ b/src/lib/image.cc @@ -1219,6 +1219,17 @@ Image::bytes_per_pixel(int component) const } #endif + if ( + _pixel_format == AV_PIX_FMT_0RGB || + _pixel_format == AV_PIX_FMT_RGB0 || + _pixel_format == AV_PIX_FMT_0BGR || + _pixel_format == AV_PIX_FMT_BGR0) { + /* Each pixel has an empty byte which we need to account for when allocating, + * otherwise we'll corrupt the image. + */ + bpp[3] = bpp[0]; + } + if ((d->flags & AV_PIX_FMT_FLAG_PLANAR) == 0) { /* Not planar; sum them up */ return bpp[0] + bpp[1] + bpp[2] + bpp[3]; |