From ae379d486deb74947abeeb9daacf2188cc20b076 Mon Sep 17 00:00:00 2001 From: mahendrana Date: Tue, 13 May 2025 23:59:29 +0200 Subject: [PATCH 01/18] Renaming of libde265 library Renaming of libde265 library as the library name is changed in the libde265 project --- src/FileOnQ.Imaging.Heif/Build/libde265.targets | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/FileOnQ.Imaging.Heif/Build/libde265.targets b/src/FileOnQ.Imaging.Heif/Build/libde265.targets index 665f164..7f80e19 100644 --- a/src/FileOnQ.Imaging.Heif/Build/libde265.targets +++ b/src/FileOnQ.Imaging.Heif/Build/libde265.targets @@ -16,7 +16,11 @@ - + + + + + @@ -25,4 +29,4 @@ - \ No newline at end of file + From bfa49e9237ef7dc91d930c25c7585c0bc4d0950e Mon Sep 17 00:00:00 2001 From: mahendrana Date: Wed, 14 May 2025 00:00:14 +0200 Subject: [PATCH 02/18] Update libde265 version to v1.0.15 --- src/FileOnQ.Imaging.Heif/Build/libde265.targets | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/FileOnQ.Imaging.Heif/Build/libde265.targets b/src/FileOnQ.Imaging.Heif/Build/libde265.targets index 7f80e19..4fd6f2a 100644 --- a/src/FileOnQ.Imaging.Heif/Build/libde265.targets +++ b/src/FileOnQ.Imaging.Heif/Build/libde265.targets @@ -3,12 +3,12 @@ - + - + From 333af17bed68ca9137059b10c0620246623b2757 Mon Sep 17 00:00:00 2001 From: mahendrana Date: Wed, 14 May 2025 21:54:04 +0200 Subject: [PATCH 03/18] Corrected a typo --- src/FileOnQ.Imaging.Heif/Build/libde265.targets | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/FileOnQ.Imaging.Heif/Build/libde265.targets b/src/FileOnQ.Imaging.Heif/Build/libde265.targets index 4fd6f2a..1552fc6 100644 --- a/src/FileOnQ.Imaging.Heif/Build/libde265.targets +++ b/src/FileOnQ.Imaging.Heif/Build/libde265.targets @@ -13,12 +13,12 @@ - - - + + + From af4f9b11d789935deb4a9f66bb817d1a479a5b18 Mon Sep 17 00:00:00 2001 From: mahendrana Date: Wed, 14 May 2025 22:15:15 +0200 Subject: [PATCH 04/18] Another typo correction All should be GREEN this time :-) --- src/FileOnQ.Imaging.Heif/Build/libde265.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/FileOnQ.Imaging.Heif/Build/libde265.targets b/src/FileOnQ.Imaging.Heif/Build/libde265.targets index 1552fc6..3394399 100644 --- a/src/FileOnQ.Imaging.Heif/Build/libde265.targets +++ b/src/FileOnQ.Imaging.Heif/Build/libde265.targets @@ -18,7 +18,7 @@ - + From 98953c01eb9e0d1b96ba208f5975725159290b9d Mon Sep 17 00:00:00 2001 From: ganeshmaa <47292159+ganeshmaa@users.noreply.github.com> Date: Thu, 15 May 2025 11:16:34 +0530 Subject: [PATCH 05/18] Update libheif.targets --- src/FileOnQ.Imaging.Heif/Build/libheif.targets | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/FileOnQ.Imaging.Heif/Build/libheif.targets b/src/FileOnQ.Imaging.Heif/Build/libheif.targets index 8ead888..15ff214 100644 --- a/src/FileOnQ.Imaging.Heif/Build/libheif.targets +++ b/src/FileOnQ.Imaging.Heif/Build/libheif.targets @@ -28,12 +28,12 @@ - + - + @@ -50,4 +50,4 @@ - \ No newline at end of file + From 13b8ce21c9326f5cbdfa4d98ba95e5101eeb9fc1 Mon Sep 17 00:00:00 2001 From: mahendrana Date: Thu, 15 May 2025 21:41:53 +0200 Subject: [PATCH 06/18] Use LibHeif v1.19.1 Try to make LibHeif build successful with VS 2019 --- src/FileOnQ.Imaging.Heif/Build/libheif.targets | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/FileOnQ.Imaging.Heif/Build/libheif.targets b/src/FileOnQ.Imaging.Heif/Build/libheif.targets index 15ff214..ab35e6a 100644 --- a/src/FileOnQ.Imaging.Heif/Build/libheif.targets +++ b/src/FileOnQ.Imaging.Heif/Build/libheif.targets @@ -28,12 +28,12 @@ - + - + From 1329093c96b8cb30ca478186aa02efa1e1f142b7 Mon Sep 17 00:00:00 2001 From: mahendrana Date: Thu, 15 May 2025 22:24:35 +0200 Subject: [PATCH 07/18] Fix header file path --- src/FileOnQ.Imaging.Heif.Encoders/encoder.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/FileOnQ.Imaging.Heif.Encoders/encoder.h b/src/FileOnQ.Imaging.Heif.Encoders/encoder.h index 7bf94ad..b2f123f 100644 --- a/src/FileOnQ.Imaging.Heif.Encoders/encoder.h +++ b/src/FileOnQ.Imaging.Heif.Encoders/encoder.h @@ -29,7 +29,7 @@ #include #include -#include +#include class Encoder From 9abb0a8a5abaf71ccbb163278ae5d4c9da849eb9 Mon Sep 17 00:00:00 2001 From: mahendrana Date: Thu, 15 May 2025 22:25:15 +0200 Subject: [PATCH 08/18] Fix header file path --- src/FileOnQ.Imaging.Heif.Encoders/encoders_api.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/FileOnQ.Imaging.Heif.Encoders/encoders_api.cpp b/src/FileOnQ.Imaging.Heif.Encoders/encoders_api.cpp index d236861..e95dfcb 100644 --- a/src/FileOnQ.Imaging.Heif.Encoders/encoders_api.cpp +++ b/src/FileOnQ.Imaging.Heif.Encoders/encoders_api.cpp @@ -1,7 +1,7 @@ #include #include #include -#include +#include #include "encoders_api.h" #include "encoder.h" @@ -38,4 +38,4 @@ void free_pointer(void* pointer) return; free(pointer); -} \ No newline at end of file +} From 3d13320ab20f583fa86d6e269a15d3c438056dfd Mon Sep 17 00:00:00 2001 From: mahendrana Date: Thu, 15 May 2025 22:25:37 +0200 Subject: [PATCH 09/18] Fix header file path --- src/FileOnQ.Imaging.Heif.Encoders/encoders_api.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/FileOnQ.Imaging.Heif.Encoders/encoders_api.h b/src/FileOnQ.Imaging.Heif.Encoders/encoders_api.h index 05e4ea8..1041b47 100644 --- a/src/FileOnQ.Imaging.Heif.Encoders/encoders_api.h +++ b/src/FileOnQ.Imaging.Heif.Encoders/encoders_api.h @@ -1,7 +1,7 @@ #pragma once #include -#include +#include #include "encoder_jpeg.h" @@ -16,4 +16,4 @@ extern "C" ENCODERS_API heif_colorspace encoder_colorspace(Encoder * encoder, bo extern "C" ENCODERS_API heif_chroma encoder_chroma(Encoder * encoder, bool has_alpha, int bit_depth); extern "C" ENCODERS_API bool encode(Encoder* encoder, const struct heif_image_handle* handle, const struct heif_image* image, unsigned char** buffer, unsigned long* buffer_size); extern "C" ENCODERS_API void encoder_update_decoding_options(Encoder * encoder, const struct heif_image_handle* handle, struct heif_decoding_options* options); -extern "C" ENCODERS_API void free_pointer(void* pointer); \ No newline at end of file +extern "C" ENCODERS_API void free_pointer(void* pointer); From 033624623ac59f20c31b73c0e7a8307154b91b6a Mon Sep 17 00:00:00 2001 From: mahendrana Date: Thu, 15 May 2025 22:52:32 +0200 Subject: [PATCH 10/18] Try LibHeif v1.17.6 --- src/FileOnQ.Imaging.Heif/Build/libheif.targets | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/FileOnQ.Imaging.Heif/Build/libheif.targets b/src/FileOnQ.Imaging.Heif/Build/libheif.targets index ab35e6a..c96d40c 100644 --- a/src/FileOnQ.Imaging.Heif/Build/libheif.targets +++ b/src/FileOnQ.Imaging.Heif/Build/libheif.targets @@ -28,12 +28,12 @@ - + - + From 6f65662c6db9f1b45f394387ed733200ddfd9450 Mon Sep 17 00:00:00 2001 From: mahendrana Date: Thu, 15 May 2025 22:53:40 +0200 Subject: [PATCH 11/18] Revert libheif header path --- src/FileOnQ.Imaging.Heif.Encoders/encoder.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/FileOnQ.Imaging.Heif.Encoders/encoder.h b/src/FileOnQ.Imaging.Heif.Encoders/encoder.h index b2f123f..7bf94ad 100644 --- a/src/FileOnQ.Imaging.Heif.Encoders/encoder.h +++ b/src/FileOnQ.Imaging.Heif.Encoders/encoder.h @@ -29,7 +29,7 @@ #include #include -#include +#include class Encoder From 33cf1c1956e89bb238b7ce7f940426dd720da07f Mon Sep 17 00:00:00 2001 From: mahendrana Date: Thu, 15 May 2025 22:54:05 +0200 Subject: [PATCH 12/18] Revert libheif header path --- src/FileOnQ.Imaging.Heif.Encoders/encoders_api.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/FileOnQ.Imaging.Heif.Encoders/encoders_api.cpp b/src/FileOnQ.Imaging.Heif.Encoders/encoders_api.cpp index e95dfcb..fc7bf22 100644 --- a/src/FileOnQ.Imaging.Heif.Encoders/encoders_api.cpp +++ b/src/FileOnQ.Imaging.Heif.Encoders/encoders_api.cpp @@ -1,7 +1,7 @@ #include #include #include -#include +#include #include "encoders_api.h" #include "encoder.h" From 1fd3b3a58ca2193286863e2d9ad5d6bd7451bc43 Mon Sep 17 00:00:00 2001 From: mahendrana Date: Thu, 15 May 2025 22:54:26 +0200 Subject: [PATCH 13/18] Revert libheif header path --- src/FileOnQ.Imaging.Heif.Encoders/encoders_api.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/FileOnQ.Imaging.Heif.Encoders/encoders_api.h b/src/FileOnQ.Imaging.Heif.Encoders/encoders_api.h index 1041b47..d7be3a4 100644 --- a/src/FileOnQ.Imaging.Heif.Encoders/encoders_api.h +++ b/src/FileOnQ.Imaging.Heif.Encoders/encoders_api.h @@ -1,7 +1,7 @@ #pragma once #include -#include +#include #include "encoder_jpeg.h" From f29ef06c3fab6e9cfa851aec0531a090cb013819 Mon Sep 17 00:00:00 2001 From: mahendrana Date: Thu, 15 May 2025 23:33:32 +0200 Subject: [PATCH 14/18] Try LibHeif v1.19.1 --- src/FileOnQ.Imaging.Heif/Build/libheif.targets | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/FileOnQ.Imaging.Heif/Build/libheif.targets b/src/FileOnQ.Imaging.Heif/Build/libheif.targets index c96d40c..ab35e6a 100644 --- a/src/FileOnQ.Imaging.Heif/Build/libheif.targets +++ b/src/FileOnQ.Imaging.Heif/Build/libheif.targets @@ -28,12 +28,12 @@ - + - + From d41e13f495f066a22594fac5c8464ff7c3dc3b37 Mon Sep 17 00:00:00 2001 From: mahendrana Date: Thu, 15 May 2025 23:35:44 +0200 Subject: [PATCH 15/18] Use header path that corresponds to v1.19.1 --- src/FileOnQ.Imaging.Heif.Encoders/encoder.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/FileOnQ.Imaging.Heif.Encoders/encoder.h b/src/FileOnQ.Imaging.Heif.Encoders/encoder.h index 7bf94ad..b2f123f 100644 --- a/src/FileOnQ.Imaging.Heif.Encoders/encoder.h +++ b/src/FileOnQ.Imaging.Heif.Encoders/encoder.h @@ -29,7 +29,7 @@ #include #include -#include +#include class Encoder From a7b5acd094d92c43e9d97c9ed508e75ccdf728de Mon Sep 17 00:00:00 2001 From: mahendrana Date: Thu, 15 May 2025 23:36:19 +0200 Subject: [PATCH 16/18] Use header path that corresponds to v1.19.1 --- src/FileOnQ.Imaging.Heif.Encoders/encoders_api.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/FileOnQ.Imaging.Heif.Encoders/encoders_api.h b/src/FileOnQ.Imaging.Heif.Encoders/encoders_api.h index d7be3a4..1041b47 100644 --- a/src/FileOnQ.Imaging.Heif.Encoders/encoders_api.h +++ b/src/FileOnQ.Imaging.Heif.Encoders/encoders_api.h @@ -1,7 +1,7 @@ #pragma once #include -#include +#include #include "encoder_jpeg.h" From 477c5f504ed744725c943699f06fb76b456c0eba Mon Sep 17 00:00:00 2001 From: mahendrana Date: Thu, 15 May 2025 23:36:52 +0200 Subject: [PATCH 17/18] Use header path that corresponds to v1.19.1 --- src/FileOnQ.Imaging.Heif.Encoders/encoders_api.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/FileOnQ.Imaging.Heif.Encoders/encoders_api.cpp b/src/FileOnQ.Imaging.Heif.Encoders/encoders_api.cpp index fc7bf22..e95dfcb 100644 --- a/src/FileOnQ.Imaging.Heif.Encoders/encoders_api.cpp +++ b/src/FileOnQ.Imaging.Heif.Encoders/encoders_api.cpp @@ -1,7 +1,7 @@ #include #include #include -#include +#include #include "encoders_api.h" #include "encoder.h" From 4c2a165d20039881358de714a2504d28bb6ce694 Mon Sep 17 00:00:00 2001 From: mahendran Date: Fri, 16 May 2025 19:58:05 +0200 Subject: [PATCH 18/18] Update of expected ID values, as the encoded data with the LibHeif v1.19.1 as compared to old version used(v1.12.0) so far --- tests/FileOnQ.Imaging.Heif.Tests/TestData.cs | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/tests/FileOnQ.Imaging.Heif.Tests/TestData.cs b/tests/FileOnQ.Imaging.Heif.Tests/TestData.cs index 82afdae..28b25ba 100644 --- a/tests/FileOnQ.Imaging.Heif.Tests/TestData.cs +++ b/tests/FileOnQ.Imaging.Heif.Tests/TestData.cs @@ -20,11 +20,11 @@ public static class PrimaryImageSave static IDictionary BuildDictionary() => new Dictionary { - { Image1, "FFEA4484A3DE2DBE3D85321EF5ABDFF2C5D4367F6D77F2899CB0D62B270A9388" }, - { Image2, "AA9A7640A97AA5824ECBD84C3CDCB23117A7E01BC7A313C6390B0702559579A7" }, - { Image3, "D544E3BA40215AE671DE0D4474489F596AA6AFB27F9774E6C3B322242B17634F" }, - { Image4, "51BF8E1F356A618E3D86E13560B557B91CB6C6269F0C6298BEBDC447675A4250" }, - { Image5, "0B223CCEE9712EAD50F51E0AE96DA5276DE98D0ED48B60D958B354B228B88B01" } + { Image1, "357C170D04A5FD62D19E782FC05EBD717B656DADB1ABA4920E042D91A265F294" }, + { Image2, "DBB83C7C34F11752644B42C8B5DA94D4397AF5C5C4E8051DA81DCCEC4DDC229C" }, + { Image3, "5532E2143B056E2D125D83B4CCA55136C360F60F039831249F241DB42C6BD6B4" }, + { Image4, "6A78A1511735BF2573B48AC23071FCE493E8A81F2A8A409C290D12EDA8553C83" }, + { Image5, "14B45F3337FB5AC9C252F16E0E3A57A42D6A9BC124950B7F35DAE16B547C385D" } }; } @@ -35,11 +35,11 @@ public static class ThuumbnailSave static IDictionary BuildDictionary() => new Dictionary { - { Image1, "FFEA4484A3DE2DBE3D85321EF5ABDFF2C5D4367F6D77F2899CB0D62B270A9388" }, - { Image2, "AA9A7640A97AA5824ECBD84C3CDCB23117A7E01BC7A313C6390B0702559579A7" }, - { Image3, "D544E3BA40215AE671DE0D4474489F596AA6AFB27F9774E6C3B322242B17634F" }, - { Image4, "51BF8E1F356A618E3D86E13560B557B91CB6C6269F0C6298BEBDC447675A4250" }, - { Image5, "6D9C8D886B8EC7215233A1E596BFC4B21AB1E51F636E944EAE94582456E0B022" } + { Image1, "357C170D04A5FD62D19E782FC05EBD717B656DADB1ABA4920E042D91A265F294" }, + { Image2, "DBB83C7C34F11752644B42C8B5DA94D4397AF5C5C4E8051DA81DCCEC4DDC229C" }, + { Image3, "5532E2143B056E2D125D83B4CCA55136C360F60F039831249F241DB42C6BD6B4" }, + { Image4, "6A78A1511735BF2573B48AC23071FCE493E8A81F2A8A409C290D12EDA8553C83" }, + { Image5, "C1F02AE3D0C9BD858FEBBA5B3B5492B128B220318D49E21741AB5A0567DB9E05" } }; } }