mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-27 12:40:05 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update 3rdparty libspng to 0.7.4

Browse Source 
Include three fixes:
e68ba5df57
6c7c8ce372
c9451cab66

and three chores:
d86a11d3ab
bab9f94a11
fb768002d4

I have reviewed CMakeLists.txt and I think disabling unused-variable
warning is not needed.
This commit is contained in:
Letu Ren 2023-12-12 23:05:02 +08:00
parent 850be1e087
commit 46743c1701
4 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
3rdparty/libspng/CMakeLists.txt vendored
View File

@ -23,7 +23,6 @@ if(MSVC)
endif(MSVC) endif(MSVC)
add_library(${SPNG_LIBRARY} STATIC ${OPENCV_3RDPARTY_EXCLUDE_FROM_ALL} ${spng_headers} ${spng_sources}) add_library(${SPNG_LIBRARY} STATIC ${OPENCV_3RDPARTY_EXCLUDE_FROM_ALL} ${spng_headers} ${spng_sources})
ocv_warnings_disable(CMAKE_C_FLAGS -Wunused-variable)
target_link_libraries(${SPNG_LIBRARY} ${ZLIB_LIBRARIES}) target_link_libraries(${SPNG_LIBRARY} ${ZLIB_LIBRARIES})
set_target_properties(${SPNG_LIBRARY} set_target_properties(${SPNG_LIBRARY}

2
3rdparty/libspng/LICENSE vendored
View File

@ -1,6 +1,6 @@
BSD 2-Clause License BSD 2-Clause License
Copyright (c) 2018-2022, Randy <randy408@protonmail.com> Copyright (c) 2018-2023, Randy <randy408@protonmail.com>
All rights reserved. All rights reserved.
Redistribution and use in source and binary forms, with or without Redistribution and use in source and binary forms, with or without

8
3rdparty/libspng/spng.c vendored
View File

@ -2691,6 +2691,7 @@ static int read_non_idat_chunks(spng_ctx *ctx)
if(!memcmp(chunk.type, type_exif, 4)) if(!memcmp(chunk.type, type_exif, 4))
{ {
if(ctx->file.exif) return SPNG_EDUP_EXIF; if(ctx->file.exif) return SPNG_EDUP_EXIF;
if(!chunk.length) return SPNG_EEXIF;
ctx->file.exif = 1; ctx->file.exif = 1;
@ -4999,11 +5000,11 @@ void spng_ctx_free(spng_ctx *ctx)
spng__free(ctx, ctx->prev_scanline_buf); spng__free(ctx, ctx->prev_scanline_buf);
spng__free(ctx, ctx->filtered_scanline_buf); spng__free(ctx, ctx->filtered_scanline_buf);
spng_free_fn *free_func = ctx->alloc.free_fn; spng_free_fn *free_fn = ctx->alloc.free_fn;
memset(ctx, 0, sizeof(spng_ctx)); memset(ctx, 0, sizeof(spng_ctx));
free_func(ctx); free_fn(ctx);
} }
static int buffer_read_fn(spng_ctx *ctx, void *user, void *data, size_t n) static int buffer_read_fn(spng_ctx *ctx, void *user, void *data, size_t n)
@ -5743,7 +5744,8 @@ int spng_set_iccp(spng_ctx *ctx, struct spng_iccp *iccp)
SPNG_SET_CHUNK_BOILERPLATE(iccp); SPNG_SET_CHUNK_BOILERPLATE(iccp);
if(check_png_keyword(iccp->profile_name)) return SPNG_EICCP_NAME; if(check_png_keyword(iccp->profile_name)) return SPNG_EICCP_NAME;
if(!iccp->profile_len || iccp->profile_len > UINT_MAX) return 1; if(!iccp->profile_len) return SPNG_ECHUNK_SIZE;
if(iccp->profile_len > spng_u32max) return SPNG_ECHUNK_STDLEN;
if(ctx->iccp.profile && !ctx->user.iccp) spng__free(ctx, ctx->iccp.profile); if(ctx->iccp.profile && !ctx->user.iccp) spng__free(ctx, ctx->iccp.profile);

4
3rdparty/libspng/spng.h vendored
View File

@ -1,4 +1,4 @@
/* SPDX-License-Identifier: (BSD-2-Clause AND libpng-2.0) */ /* SPDX-License-Identifier: BSD-2-Clause */
#ifndef SPNG_H #ifndef SPNG_H
#define SPNG_H #define SPNG_H
@ -28,7 +28,7 @@ extern "C" {
#define SPNG_VERSION_MAJOR 0 #define SPNG_VERSION_MAJOR 0
#define SPNG_VERSION_MINOR 7 #define SPNG_VERSION_MINOR 7
#define SPNG_VERSION_PATCH 3 #define SPNG_VERSION_PATCH 4
enum spng_errno enum spng_errno
{ {