diff options
| author | Pierre Joye <pierre.php@gmail.com> | 2022-01-22 17:29:04 +0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-22 17:29:04 +0700 |
| commit | f1a53c082173567b8ad07eaba8fc7ba66457a730 (patch) | |
| tree | 4b2752d19dd8d7f847dc4dd10936bf2ec0e20427 /src | |
| parent | 0f9dd9627aa9f5095164a73e84905bb4af4bfc8f (diff) | |
| download | libgd-f1a53c082173567b8ad07eaba8fc7ba66457a730.tar.gz | |
#788 fix bug in HEIF usage, stride is require (#801)
fix bug #788 in HEIF usage, stride is require
Diffstat (limited to 'src')
| -rw-r--r-- | src/gd_heif.c | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/src/gd_heif.c b/src/gd_heif.c index 2c7c3d3..adccbab 100644 --- a/src/gd_heif.c +++ b/src/gd_heif.c @@ -125,7 +125,8 @@ static gdImagePtr _gdImageCreateFromHeifCtx(gdIOCtx *infile, gd_heif_brand expec size_t size = 0, n = GD_HEIF_ALLOC_STEP; gdImagePtr im; int x, y; - uint8_t *p; + uint8_t *p, *row_start; + int stride; magic_len = gdGetBuf(magic, GD_HEIF_HEADER, infile); if (magic_len != GD_HEIF_HEADER || !_gdHeifCheckBrand(magic, expected_brand)) { @@ -207,7 +208,7 @@ static gdImagePtr _gdImageCreateFromHeifCtx(gdIOCtx *infile, gd_heif_brand expec heif_context_free(heif_ctx); return NULL; } - rgba = (uint8_t *)heif_image_get_plane_readonly(heif_im, heif_channel_interleaved, NULL); + rgba = (uint8_t *)heif_image_get_plane_readonly(heif_im, heif_channel_interleaved, &stride); if (!rgba) { gd_error("gd-heif cannot get image plane\n"); gdFree(filedata); @@ -217,7 +218,9 @@ static gdImagePtr _gdImageCreateFromHeifCtx(gdIOCtx *infile, gd_heif_brand expec gdImageDestroy(im); return NULL; } + row_start = rgba; for (y = 0, p = rgba; y < height; y++) { + p = row_start; for (x = 0; x < width; x++) { uint8_t r = *(p++); uint8_t g = *(p++); @@ -225,6 +228,7 @@ static gdImagePtr _gdImageCreateFromHeifCtx(gdIOCtx *infile, gd_heif_brand expec uint8_t a = gdAlphaMax - (*(p++) >> 1); im->tpixels[y][x] = gdTrueColorAlpha(r, g, b, a); } + row_start += stride; } gdFree(filedata); heif_image_release(heif_im); @@ -273,7 +277,8 @@ static int _gdImageHeifCtx(gdImagePtr im, gdIOCtx *outfile, int quality, gdHeifC uint8_t *rgba; int x, y; uint8_t *p; - + uint8_t *row_start; + int stride; if (im == NULL) { return GD_FALSE; } @@ -349,7 +354,7 @@ static int _gdImageHeifCtx(gdImagePtr im, gdIOCtx *outfile, int quality, gdHeifC return GD_FALSE; } - rgba = (uint8_t *)heif_image_get_plane_readonly(heif_im, heif_channel_interleaved, NULL); + rgba = (uint8_t *)heif_image_get_plane_readonly(heif_im, heif_channel_interleaved, &stride); if (!rgba) { gd_error("gd-heif cannot get image plane\n"); heif_image_release(heif_im); @@ -357,8 +362,9 @@ static int _gdImageHeifCtx(gdImagePtr im, gdIOCtx *outfile, int quality, gdHeifC heif_context_free(heif_ctx); return GD_FALSE; } - p = rgba; + row_start = rgba; for (y = 0; y < gdImageSY(im); y++) { + p = row_start; for (x = 0; x < gdImageSX(im); x++) { int c; char a; @@ -374,6 +380,7 @@ static int _gdImageHeifCtx(gdImagePtr im, gdIOCtx *outfile, int quality, gdHeifC *(p++) = gdTrueColorGetBlue(c); *(p++) = a; } + row_start += stride; } err = heif_context_encode_image(heif_ctx, heif_im, heif_enc, NULL, NULL); heif_encoder_release(heif_enc); |