Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
28 changes: 11 additions & 17 deletions depends/common/libheif/01-windows-warnings.patch
Original file line number Diff line number Diff line change
@@ -1,26 +1,21 @@
--- a/libheif/heif_colorconversion.cc
+++ b/libheif/heif_colorconversion.cc
@@ -1811,7 +1811,7 @@ Op_mono_to_RGB24_32::convert_colorspace(const std::shared_ptr<const HeifPixelIma

outimg->add_plane(heif_channel_interleaved, width, height, 8);

- const uint8_t* in_y, * in_a;
+ const uint8_t* in_y, * in_a = nullptr;
int in_y_stride = 0, in_a_stride;

uint8_t* out_p;
@@ -2160,7 +2160,7 @@ Op_RGB24_32_to_YCbCr444_GBR::convert_colorspace(const std::shared_ptr<const Heif
outimg->add_plane(heif_channel_Alpha, width, height, 8);
diff --git a/libheif/color-conversion/rgb2yuv.cc b/libheif/color-conversion/rgb2yuv.cc
index 6b2df3b..f07aa54 100644
--- a/libheif/color-conversion/rgb2yuv.cc
+++ b/libheif/color-conversion/rgb2yuv.cc
@@ -835,7 +835,7 @@ Op_RGB24_32_to_YCbCr444_GBR::convert_colorspace(const std::shared_ptr<const Heif
}
}

- uint8_t* out_cb, * out_cr, * out_y, * out_a;
+ uint8_t* out_cb, * out_cr, * out_y, * out_a = nullptr;
int out_cb_stride = 0, out_cr_stride = 0, out_y_stride = 0, out_a_stride = 0;

const uint8_t* in_p;
--- a/libheif/heif_context.cc
+++ b/libheif/heif_context.cc
@@ -93,7 +93,7 @@ static int32_t readvec_signed(const std::vector<uint8_t>& data, int& ptr, int le
diff --git a/libheif/context.cc b/libheif/context.cc
index 28292a5..ffa2d1d 100644
--- a/libheif/context.cc
+++ b/libheif/context.cc
@@ -100,7 +100,7 @@ static int32_t readvec_signed(const std::vector<uint8_t>& data, int& ptr, int le
val &= ~high_bit;

if (negative) {
Expand All @@ -29,4 +24,3 @@
}
else {
return val;

10 changes: 0 additions & 10 deletions depends/common/libheif/02-remove-werror.patch

This file was deleted.

8 changes: 0 additions & 8 deletions depends/common/libheif/03-disable-gdk-pixbuf.patch

This file was deleted.

2 changes: 1 addition & 1 deletion depends/common/libheif/flags.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
-DBUILD_SHARED_LIBS=0 -DLIBHEIF_STATIC_BUILD=1 -DWITH_EXAMPLES=0 -DWITH_X265=0 -DWITH_RAV1E=0 -DWITH_AOM=0 -DWITH_DAV1D=0
-DBUILD_SHARED_LIBS=OFF -DENABLE_PLUGIN_LOADING=OFF -DWITH_LIBDE265=OFF -DWITH_X265=OFF -DWITH_DAV1D=OFF -DWITH_AOM_ENCODER=OFF -DWITH_AOM_DECODER=OFF -DWITH_SvtEnc=OFF -DWITH_RAV1E=OFF -DWITH_EXAMPLES=OFF -DWITH_GDK_PIXBUF=OFF -DWITH_REDUCED_VISIBILITY=ON -DWITH_DEFLATE_HEADER_COMPRESSION=OFF -DENABLE_MULTITHREADING_SUPPORT=ON -DENABLE_PARALLEL_TILE_DECODING=ON -DWITH_LIBSHARPYUV=OFF
2 changes: 1 addition & 1 deletion depends/common/libheif/libheif.sha256
Original file line number Diff line number Diff line change
@@ -1 +1 @@
e1ac2abb354fdc8ccdca71363ebad7503ad731c84022cf460837f0839e171718
ac15b54b6d7c315710e156d119b8a1bfc89f29621e99222b2750b1f31c9c3558
2 changes: 1 addition & 1 deletion depends/common/libheif/libheif.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
libheif https://github.com/strukturag/libheif/releases/download/v1.12.0/libheif-1.12.0.tar.gz
libheif https://mirrors.kodi.tv/build-deps/sources/libheif-1.16.1.tar.gz