8000 Fix bugs and update libjxl by sincos2854 · Pull Request #5 · uyjulian/ifjxl · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Fix bugs and update libjxl #5

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
merged 2 commits into from
Mar 19, 2023
Merged

Fix bugs and update libjxl #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
37b93ea
Fix handling of decoding errors
Mar 19, 2023
336175a
Update libjxl version to v0.8.1
Mar 19, 2023
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
3 changes: 2 additions & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ DEPENDENCY_SOURCE_DIRECTORY_LIBJXL := $(DEPENDENCY_SOURCE_DIRECTORY)/libjxl
DEPENDENCY_SOURCE_URL_LIBJXL := https://github.com/libjxl/libjxl.git

$(DEPENDENCY_SOURCE_DIRECTORY_LIBJXL): | $(DEPENDENCY_SOURCE_DIRECTORY)
git clone --depth 1 --branch v0.8.0 --recursive --shallow-submodules $(DEPENDENCY_SOURCE_URL_LIBJXL) $@
git clone --depth 1 --branch v0.8.1 --recursive --shallow-submodules $(DEPENDENCY_SOURCE_URL_LIBJXL) $@

$(DEPENDENCY_OUTPUT_DIRECTORY)/lib/libjxl_threads.a: $(DEPENDENCY_OUTPUT_DIRECTORY)/lib/libjxl.a
$(DEPENDENCY_OUTPUT_DIRECTORY)/lib/libhwy.a: $(DEPENDENCY_OUTPUT_DIRECTORY)/lib/libjxl.a
Expand Down Expand Up @@ -195,6 +195,7 @@ $(DEPENDENCY_OUTPUT_DIRECTORY)/lib/libjxl.a: | $(DEPENDENCY_SOURCE_DIRECTORY_LIB
-DBUILD_TESTING=OFF \
-DJPEGXL_ENABLE_TOOLS=OFF \
-DJPEGXL_ENABLE_VIEWERS=OFF \
-DJPEGXL_STATIC=ON \
&& \
cmake --build $(DEPENDENCY_BUILD_DIRECTORY_LIBJXL) && \
cmake --build $(DEPENDENCY_BUILD_DIRECTORY_LIBJXL) --target install
4 changes: 4 additions & 0 deletions extractor.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,7 @@ int getBMPFromJXL(const uint8_t* input_data, size_t file_size,HANDLE* h_bitmap_i
if (NULL == bitmap_data)
{
LocalFree(*h_bitmap_data);
*h_bitmap_data = NULL;
DBGFPRINTF(stderr, "Memory error\n");
ret = 0;
goto cleanup;
Expand Down Expand Up @@ -213,6 +214,7 @@ int getBMPFromJXL(const uint8_t* input_data, size_t file_size,HANDLE* h_bitmap_i
if (NULL == bitmap_info_header)
{
LocalFree(*h_bitmap_info);
*h_bitmap_info = NULL;
DBGFPRINTF(stderr, "Memory error\n");
ret = 0;
goto cleanup;
Expand All @@ -234,11 +236,13 @@ int getBMPFromJXL(const uint8_t* input_data, size_t file_size,HANDLE* h_bitmap_i
{
LocalUnlock(*h_bitmap_data);
LocalFree(*h_bitmap_data);
*h_bitmap_data = NULL;
}
if (NULL != bitmap_info_header && 0 == ret)
{
LocalUnlock(*h_bitmap_info);
LocalFree(*h_bitmap_info);
*h_bitmap_info = NULL;
}
if (NULL != runner)
{
Expand Down
0