Skip to content

Fix the wrong calculation of bitDepth of HEIF encoding for non-alpha image, compatbile for libheif 1.5.0 #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dreampiggy merged 1 commit into from
Aug 18, 2019
Merged

Fix the wrong calculation of bitDepth of HEIF encoding for non-alpha image, compatbile for libheif 1.5.0 #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions Example/Podfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
PODS:
- libde265 (1.0.3)
- libheif/libde265 (1.4.0):
- libheif/libde265 (1.5.0):
- libde265
- libheif/libheif
- libheif/libheif (1.4.0)
- libheif/libx265 (1.4.0):
- libheif/libheif (1.5.0)
- libheif/libx265 (1.5.0):
- libheif/libheif
- libx265
- libx265 (3.0):
Expand All @@ -29,7 +29,7 @@ PODS:
- libx265/encoder
- libx265/input
- libx265/output
- SDWebImage/Core (5.0.6)
- SDWebImage/Core (5.1.0)
- SDWebImageHEIFCoder/libde265 (0.5.3):
- libheif/libde265
- SDWebImage/Core (~> 5.0)
Expand Down Expand Up @@ -59,11 +59,11 @@ EXTERNAL SOURCES:

SPEC CHECKSUMS:
libde265: b2a0cc3d2aeaafb792b43fcf2a122f42e1de107c
libheif: e79ed1935019556d3b7a5b8926dcbaa478cb4180
libheif: 6ddc3179ff63e975ceebb65de50ba1728cc9d457
libx265: 23ab716aae3eff1e6b68b3db6ace8883867691c4
SDWebImage: 920f1a2ff1ca8296ad34f6e0510a1ef1d70ac965
SDWebImage: fb387001955223213dde14bc08c8b73f371f8d8f
SDWebImageHEIFCoder: 47c82fa89aeaf95240213aa844754b441ef4de6f

PODFILE CHECKSUM: ed097a0e3cb0df40f8e18e8e1e8b396ec38d29ff

COCOAPODS: 1.7.1
COCOAPODS: 1.7.5
7 changes: 4 additions & 3 deletions SDWebImageHEIFCoder/Classes/SDImageHEIFCoder.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,8 +208,6 @@ - (nullable NSData *)sd_encodedHEIFDataWithImage:(nonnull UIImage *)image qualit

size_t width = CGImageGetWidth(imageRef);
size_t height = CGImageGetHeight(imageRef);
size_t bytesPerRow = CGImageGetBytesPerRow(imageRef);
size_t bitsPerPixel = CGImageGetBitsPerPixel(imageRef);
CGBitmapInfo bitmapInfo = CGImageGetBitmapInfo(imageRef);
CGImageAlphaInfo alphaInfo = bitmapInfo & kCGBitmapAlphaInfoMask;
CGBitmapInfo byteOrderInfo = bitmapInfo & kCGBitmapByteOrderMask;
Expand Down Expand Up @@ -250,6 +248,9 @@ - (nullable NSData *)sd_encodedHEIFDataWithImage:(nonnull UIImage *)image qualit
vImageConverterRef convertor = NULL;
vImage_Error v_error = kvImageNoError;

size_t bitsPerPixel = hasAlpha ? 32 : 24;
size_t bytesPerRow = (width * bitsPerPixel + 7) / 8;

vImage_CGImageFormat srcFormat = {
.bitsPerComponent = (uint32_t)CGImageGetBitsPerComponent(imageRef),
.bitsPerPixel = (uint32_t)CGImageGetBitsPerPixel(imageRef),
Expand All @@ -258,7 +259,7 @@ - (nullable NSData *)sd_encodedHEIFDataWithImage:(nonnull UIImage *)image qualit
};
vImage_CGImageFormat destFormat = {
.bitsPerComponent = 8,
.bitsPerPixel = hasAlpha ? 32 : 24,
.bitsPerPixel = bitsPerPixel,
.colorSpace = [SDImageCoderHelper colorSpaceGetDeviceRGB],
.bitmapInfo = hasAlpha ? kCGImageAlphaLast | kCGBitmapByteOrderDefault : kCGImageAlphaNone | kCGBitmapByteOrderDefault // RGB888/RGBA8888 (Non-premultiplied to works for libwebp)
};
Expand Down