mirror of
https://github.com/zebrajr/opencv.git
synced 2025-12-06 00:19:46 +01:00
65cb3fd86c
libpng upgrade to 1.6.45 and cICP metadata support for PNG imwrite #27741
### Pull Request Readiness Checklist
resolves #24185
libpng docs: https://www.w3.org/TR/png-3/#cICP-chunk
similar code from ffmpeg: a700f0f72d/libavcodec/pngenc.c (L452-L456)
So issue #24185 can be solved by replacing `cv.imwrite` in user's code to `cv.imwriteWithMetadata`:
```python
cv.imwriteWithMetadata("frame.png", frame, [cv.IMAGE_METADATA_CICP], np.array([[9, 18, 0, 1]], np.uint8))
```
```
$ exiftool /home/d.kurtaev/opencv_build/frames_pr/image_38.png
ExifTool Version Number : 12.76
File Name : image_38.png
Directory : /home/d.kurtaev/opencv_build/frames_pr
File Size : 3.8 MB
File Modification Date/Time : 2025:09:02 20:48:22+03:00
File Access Date/Time : 2025:09:02 20:48:22+03:00
File Inode Change Date/Time : 2025:09:02 20:48:22+03:00
File Permissions : -rw-r--r--
File Type : PNG
File Type Extension : png
MIME Type : image/png
Image Width : 1080
Image Height : 1920
Bit Depth : 8
Color Type : RGB
Compression : Deflate/Inflate
Filter : Adaptive
Interlace : Noninterlaced
Color Primaries : BT.2020, BT.2100
Transfer Characteristics : BT.2100 HLG, ARIB STD-B67
Matrix Coefficients : Identity matrix
Video Full Range Flag : 1
Image Size : 1080x1920
Megapixels : 2.1
```
See details at https://github.com/opencv/opencv/wiki/How_to_contribute#making-a-good-pull-request
- [x] I agree to contribute to the project under Apache 2 License.
- [x] To the best of my knowledge, the proposed patch is not based on a code under GPL or another license that is incompatible with OpenCV
- [x] The PR is proposed to the proper branch
- [x] There is a reference to the original bug report and related work
- [ ] There is accuracy test, performance test and test data in opencv_extra repository, if applicable
Patch to opencv_extra has the same branch name.
- [x] The feature is well documented and sample code can be built with the project CMake
228 lines
7.7 KiB
C
228 lines
7.7 KiB
C
/* pnglibconf.h - library build configuration */
|
|
|
|
/* libpng version 1.6.45 */
|
|
|
|
/* Copyright (c) 2018-2025 Cosmin Truta */
|
|
/* Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson */
|
|
|
|
/* This code is released under the libpng license. */
|
|
/* For conditions of distribution and use, see the disclaimer */
|
|
/* and license in png.h */
|
|
|
|
/* pnglibconf.h */
|
|
/* Machine generated file: DO NOT EDIT */
|
|
/* Derived from: scripts/pnglibconf.dfa */
|
|
#ifndef PNGLCONF_H
|
|
#define PNGLCONF_H
|
|
/* options */
|
|
#define PNG_16BIT_SUPPORTED
|
|
#define PNG_ALIGNED_MEMORY_SUPPORTED
|
|
/*#undef PNG_ARM_NEON_API_SUPPORTED*/
|
|
/*#undef PNG_ARM_NEON_CHECK_SUPPORTED*/
|
|
#define PNG_BENIGN_ERRORS_SUPPORTED
|
|
#define PNG_BENIGN_READ_ERRORS_SUPPORTED
|
|
/*#undef PNG_BENIGN_WRITE_ERRORS_SUPPORTED*/
|
|
#define PNG_BUILD_GRAYSCALE_PALETTE_SUPPORTED
|
|
#define PNG_CHECK_FOR_INVALID_INDEX_SUPPORTED
|
|
#define PNG_COLORSPACE_SUPPORTED
|
|
#define PNG_CONSOLE_IO_SUPPORTED
|
|
#define PNG_CONVERT_tIME_SUPPORTED
|
|
/*#undef PNG_DISABLE_ADLER32_CHECK_SUPPORTED*/
|
|
#define PNG_EASY_ACCESS_SUPPORTED
|
|
/*#undef PNG_ERROR_NUMBERS_SUPPORTED*/
|
|
#define PNG_ERROR_TEXT_SUPPORTED
|
|
#define PNG_FIXED_POINT_SUPPORTED
|
|
#define PNG_FLOATING_ARITHMETIC_SUPPORTED
|
|
#define PNG_FLOATING_POINT_SUPPORTED
|
|
#define PNG_FORMAT_AFIRST_SUPPORTED
|
|
#define PNG_FORMAT_BGR_SUPPORTED
|
|
#define PNG_GAMMA_SUPPORTED
|
|
#define PNG_GET_PALETTE_MAX_SUPPORTED
|
|
#define PNG_HANDLE_AS_UNKNOWN_SUPPORTED
|
|
#define PNG_INCH_CONVERSIONS_SUPPORTED
|
|
#define PNG_INFO_IMAGE_SUPPORTED
|
|
#define PNG_IO_STATE_SUPPORTED
|
|
/*#undef PNG_MIPS_MMI_API_SUPPORTED*/
|
|
/*#undef PNG_MIPS_MMI_CHECK_SUPPORTED*/
|
|
/*#undef PNG_MIPS_MSA_API_SUPPORTED*/
|
|
/*#undef PNG_MIPS_MSA_CHECK_SUPPORTED*/
|
|
#define PNG_MNG_FEATURES_SUPPORTED
|
|
#define PNG_POINTER_INDEXING_SUPPORTED
|
|
/*#undef PNG_POWERPC_VSX_API_SUPPORTED*/
|
|
/*#undef PNG_POWERPC_VSX_CHECK_SUPPORTED*/
|
|
#define PNG_PROGRESSIVE_READ_SUPPORTED
|
|
#define PNG_READ_16BIT_SUPPORTED
|
|
#define PNG_READ_ALPHA_MODE_SUPPORTED
|
|
#define PNG_READ_ANCILLARY_CHUNKS_SUPPORTED
|
|
#define PNG_READ_BACKGROUND_SUPPORTED
|
|
#define PNG_READ_BGR_SUPPORTED
|
|
#define PNG_READ_CHECK_FOR_INVALID_INDEX_SUPPORTED
|
|
#define PNG_READ_COMPOSITE_NODIV_SUPPORTED
|
|
#define PNG_READ_COMPRESSED_TEXT_SUPPORTED
|
|
#define PNG_READ_EXPAND_16_SUPPORTED
|
|
#define PNG_READ_EXPAND_SUPPORTED
|
|
#define PNG_READ_FILLER_SUPPORTED
|
|
#define PNG_READ_GAMMA_SUPPORTED
|
|
#define PNG_READ_GET_PALETTE_MAX_SUPPORTED
|
|
#define PNG_READ_GRAY_TO_RGB_SUPPORTED
|
|
#define PNG_READ_INTERLACING_SUPPORTED
|
|
#define PNG_READ_INT_FUNCTIONS_SUPPORTED
|
|
#define PNG_READ_INVERT_ALPHA_SUPPORTED
|
|
#define PNG_READ_INVERT_SUPPORTED
|
|
#define PNG_READ_OPT_PLTE_SUPPORTED
|
|
#define PNG_READ_PACKSWAP_SUPPORTED
|
|
#define PNG_READ_PACK_SUPPORTED
|
|
#define PNG_READ_QUANTIZE_SUPPORTED
|
|
#define PNG_READ_RGB_TO_GRAY_SUPPORTED
|
|
#define PNG_READ_SCALE_16_TO_8_SUPPORTED
|
|
#define PNG_READ_SHIFT_SUPPORTED
|
|
#define PNG_READ_STRIP_16_TO_8_SUPPORTED
|
|
#define PNG_READ_STRIP_ALPHA_SUPPORTED
|
|
#define PNG_READ_SUPPORTED
|
|
#define PNG_READ_SWAP_ALPHA_SUPPORTED
|
|
#define PNG_READ_SWAP_SUPPORTED
|
|
#define PNG_READ_TEXT_SUPPORTED
|
|
#define PNG_READ_TRANSFORMS_SUPPORTED
|
|
#define PNG_READ_UNKNOWN_CHUNKS_SUPPORTED
|
|
#define PNG_READ_USER_CHUNKS_SUPPORTED
|
|
#define PNG_READ_USER_TRANSFORM_SUPPORTED
|
|
#define PNG_READ_bKGD_SUPPORTED
|
|
#define PNG_READ_cHRM_SUPPORTED
|
|
#define PNG_READ_cICP_SUPPORTED
|
|
#define PNG_READ_eXIf_SUPPORTED
|
|
#define PNG_READ_gAMA_SUPPORTED
|
|
#define PNG_READ_hIST_SUPPORTED
|
|
#define PNG_READ_iCCP_SUPPORTED
|
|
#define PNG_READ_iTXt_SUPPORTED
|
|
#define PNG_READ_oFFs_SUPPORTED
|
|
#define PNG_READ_pCAL_SUPPORTED
|
|
#define PNG_READ_pHYs_SUPPORTED
|
|
#define PNG_READ_sBIT_SUPPORTED
|
|
#define PNG_READ_sCAL_SUPPORTED
|
|
#define PNG_READ_sPLT_SUPPORTED
|
|
#define PNG_READ_sRGB_SUPPORTED
|
|
#define PNG_READ_tEXt_SUPPORTED
|
|
#define PNG_READ_tIME_SUPPORTED
|
|
#define PNG_READ_tRNS_SUPPORTED
|
|
#define PNG_READ_zTXt_SUPPORTED
|
|
#define PNG_SAVE_INT_32_SUPPORTED
|
|
#define PNG_SAVE_UNKNOWN_CHUNKS_SUPPORTED
|
|
#define PNG_SEQUENTIAL_READ_SUPPORTED
|
|
#define PNG_SETJMP_SUPPORTED
|
|
#define PNG_SET_OPTION_SUPPORTED
|
|
#define PNG_SET_UNKNOWN_CHUNKS_SUPPORTED
|
|
#define PNG_SET_USER_LIMITS_SUPPORTED
|
|
#define PNG_SIMPLIFIED_READ_AFIRST_SUPPORTED
|
|
#define PNG_SIMPLIFIED_READ_BGR_SUPPORTED
|
|
#define PNG_SIMPLIFIED_READ_SUPPORTED
|
|
#define PNG_SIMPLIFIED_WRITE_AFIRST_SUPPORTED
|
|
#define PNG_SIMPLIFIED_WRITE_BGR_SUPPORTED
|
|
#define PNG_SIMPLIFIED_WRITE_STDIO_SUPPORTED
|
|
#define PNG_SIMPLIFIED_WRITE_SUPPORTED
|
|
#define PNG_STDIO_SUPPORTED
|
|
#define PNG_STORE_UNKNOWN_CHUNKS_SUPPORTED
|
|
#define PNG_TEXT_SUPPORTED
|
|
#define PNG_TIME_RFC1123_SUPPORTED
|
|
#define PNG_UNKNOWN_CHUNKS_SUPPORTED
|
|
#define PNG_USER_CHUNKS_SUPPORTED
|
|
#define PNG_USER_LIMITS_SUPPORTED
|
|
#define PNG_USER_MEM_SUPPORTED
|
|
#define PNG_USER_TRANSFORM_INFO_SUPPORTED
|
|
#define PNG_USER_TRANSFORM_PTR_SUPPORTED
|
|
#define PNG_WARNINGS_SUPPORTED
|
|
#define PNG_WRITE_16BIT_SUPPORTED
|
|
#define PNG_WRITE_ANCILLARY_CHUNKS_SUPPORTED
|
|
#define PNG_WRITE_BGR_SUPPORTED
|
|
#define PNG_WRITE_CHECK_FOR_INVALID_INDEX_SUPPORTED
|
|
#define PNG_WRITE_COMPRESSED_TEXT_SUPPORTED
|
|
#define PNG_WRITE_CUSTOMIZE_COMPRESSION_SUPPORTED
|
|
#define PNG_WRITE_CUSTOMIZE_ZTXT_COMPRESSION_SUPPORTED
|
|
#define PNG_WRITE_FILLER_SUPPORTED
|
|
#define PNG_WRITE_FILTER_SUPPORTED
|
|
#define PNG_WRITE_FLUSH_SUPPORTED
|
|
#define PNG_WRITE_GET_PALETTE_MAX_SUPPORTED
|
|
#define PNG_WRITE_INTERLACING_SUPPORTED
|
|
#define PNG_WRITE_INT_FUNCTIONS_SUPPORTED
|
|
#define PNG_WRITE_INVERT_ALPHA_SUPPORTED
|
|
#define PNG_WRITE_INVERT_SUPPORTED
|
|
#define PNG_WRITE_OPTIMIZE_CMF_SUPPORTED
|
|
#define PNG_WRITE_PACKSWAP_SUPPORTED
|
|
#define PNG_WRITE_PACK_SUPPORTED
|
|
#define PNG_WRITE_SHIFT_SUPPORTED
|
|
#define PNG_WRITE_SUPPORTED
|
|
#define PNG_WRITE_SWAP_ALPHA_SUPPORTED
|
|
#define PNG_WRITE_SWAP_SUPPORTED
|
|
#define PNG_WRITE_TEXT_SUPPORTED
|
|
#define PNG_WRITE_TRANSFORMS_SUPPORTED
|
|
#define PNG_WRITE_UNKNOWN_CHUNKS_SUPPORTED
|
|
#define PNG_WRITE_USER_TRANSFORM_SUPPORTED
|
|
#define PNG_WRITE_WEIGHTED_FILTER_SUPPORTED
|
|
#define PNG_WRITE_bKGD_SUPPORTED
|
|
#define PNG_WRITE_cHRM_SUPPORTED
|
|
#define PNG_WRITE_cICP_SUPPORTED
|
|
#define PNG_WRITE_eXIf_SUPPORTED
|
|
#define PNG_WRITE_gAMA_SUPPORTED
|
|
#define PNG_WRITE_hIST_SUPPORTED
|
|
#define PNG_WRITE_iCCP_SUPPORTED
|
|
#define PNG_WRITE_iTXt_SUPPORTED
|
|
#define PNG_WRITE_oFFs_SUPPORTED
|
|
#define PNG_WRITE_pCAL_SUPPORTED
|
|
#define PNG_WRITE_pHYs_SUPPORTED
|
|
#define PNG_WRITE_sBIT_SUPPORTED
|
|
#define PNG_WRITE_sCAL_SUPPORTED
|
|
#define PNG_WRITE_sPLT_SUPPORTED
|
|
#define PNG_WRITE_sRGB_SUPPORTED
|
|
#define PNG_WRITE_tEXt_SUPPORTED
|
|
#define PNG_WRITE_tIME_SUPPORTED
|
|
#define PNG_WRITE_tRNS_SUPPORTED
|
|
#define PNG_WRITE_zTXt_SUPPORTED
|
|
#define PNG_bKGD_SUPPORTED
|
|
#define PNG_cHRM_SUPPORTED
|
|
#define PNG_cICP_SUPPORTED
|
|
#define PNG_eXIf_SUPPORTED
|
|
#define PNG_gAMA_SUPPORTED
|
|
#define PNG_hIST_SUPPORTED
|
|
#define PNG_iCCP_SUPPORTED
|
|
#define PNG_iTXt_SUPPORTED
|
|
#define PNG_oFFs_SUPPORTED
|
|
#define PNG_pCAL_SUPPORTED
|
|
#define PNG_pHYs_SUPPORTED
|
|
#define PNG_sBIT_SUPPORTED
|
|
#define PNG_sCAL_SUPPORTED
|
|
#define PNG_sPLT_SUPPORTED
|
|
#define PNG_sRGB_SUPPORTED
|
|
#define PNG_tEXt_SUPPORTED
|
|
#define PNG_tIME_SUPPORTED
|
|
#define PNG_tRNS_SUPPORTED
|
|
#define PNG_zTXt_SUPPORTED
|
|
/* end of options */
|
|
/* settings */
|
|
#define PNG_API_RULE 0
|
|
#define PNG_DEFAULT_READ_MACROS 1
|
|
#define PNG_GAMMA_THRESHOLD_FIXED 5000
|
|
#define PNG_IDAT_READ_SIZE PNG_ZBUF_SIZE
|
|
#define PNG_INFLATE_BUF_SIZE 1024
|
|
#define PNG_LINKAGE_API extern
|
|
#define PNG_LINKAGE_CALLBACK extern
|
|
#define PNG_LINKAGE_DATA extern
|
|
#define PNG_LINKAGE_FUNCTION extern
|
|
#define PNG_MAX_GAMMA_8 11
|
|
#define PNG_QUANTIZE_BLUE_BITS 5
|
|
#define PNG_QUANTIZE_GREEN_BITS 5
|
|
#define PNG_QUANTIZE_RED_BITS 5
|
|
#define PNG_TEXT_Z_DEFAULT_COMPRESSION (-1)
|
|
#define PNG_TEXT_Z_DEFAULT_STRATEGY 0
|
|
#define PNG_USER_CHUNK_CACHE_MAX 1000
|
|
#define PNG_USER_CHUNK_MALLOC_MAX 8000000
|
|
#define PNG_USER_HEIGHT_MAX 1000000
|
|
#define PNG_USER_WIDTH_MAX 1000000
|
|
#define PNG_ZBUF_SIZE 8192
|
|
#define PNG_ZLIB_VERNUM 0 /* unknown */
|
|
#define PNG_Z_DEFAULT_COMPRESSION (-1)
|
|
#define PNG_Z_DEFAULT_NOFILTER_STRATEGY 0
|
|
#define PNG_Z_DEFAULT_STRATEGY 1
|
|
#define PNG_sCAL_PRECISION 5
|
|
#define PNG_sRGB_PROFILE_CHECKS 2
|
|
/* end of settings */
|
|
#endif /* PNGLCONF_H */
|