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
153 lines
5.2 KiB
C
153 lines
5.2 KiB
C
/* pngdebug.h - Debugging macros for libpng, also used in pngtest.c
|
|
*
|
|
* Copyright (c) 2018 Cosmin Truta
|
|
* Copyright (c) 1998-2002,2004,2006-2013 Glenn Randers-Pehrson
|
|
* Copyright (c) 1996-1997 Andreas Dilger
|
|
* Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
|
|
*
|
|
* This code is released under the libpng license.
|
|
* For conditions of distribution and use, see the disclaimer
|
|
* and license in png.h
|
|
*/
|
|
|
|
/* Define PNG_DEBUG at compile time for debugging information. Higher
|
|
* numbers for PNG_DEBUG mean more debugging information. This has
|
|
* only been added since version 0.95 so it is not implemented throughout
|
|
* libpng yet, but more support will be added as needed.
|
|
*
|
|
* png_debug[1-2]?(level, message ,arg{0-2})
|
|
* Expands to a statement (either a simple expression or a compound
|
|
* do..while(0) statement) that outputs a message with parameter
|
|
* substitution if PNG_DEBUG is defined to 2 or more. If PNG_DEBUG
|
|
* is undefined, 0 or 1 every png_debug expands to a simple expression
|
|
* (actually ((void)0)).
|
|
*
|
|
* level: level of detail of message, starting at 0. A level 'n'
|
|
* message is preceded by 'n' 3-space indentations (not implemented
|
|
* on Microsoft compilers unless PNG_DEBUG_FILE is also
|
|
* defined, to allow debug DLL compilation with no standard IO).
|
|
* message: a printf(3) style text string. A trailing '\n' is added
|
|
* to the message.
|
|
* arg: 0 to 2 arguments for printf(3) style substitution in message.
|
|
*/
|
|
#ifndef PNGDEBUG_H
|
|
#define PNGDEBUG_H
|
|
/* These settings control the formatting of messages in png.c and pngerror.c */
|
|
/* Moved to pngdebug.h at 1.5.0 */
|
|
# ifndef PNG_LITERAL_SHARP
|
|
# define PNG_LITERAL_SHARP 0x23
|
|
# endif
|
|
# ifndef PNG_LITERAL_LEFT_SQUARE_BRACKET
|
|
# define PNG_LITERAL_LEFT_SQUARE_BRACKET 0x5b
|
|
# endif
|
|
# ifndef PNG_LITERAL_RIGHT_SQUARE_BRACKET
|
|
# define PNG_LITERAL_RIGHT_SQUARE_BRACKET 0x5d
|
|
# endif
|
|
# ifndef PNG_STRING_NEWLINE
|
|
# define PNG_STRING_NEWLINE "\n"
|
|
# endif
|
|
|
|
#ifdef PNG_DEBUG
|
|
# if (PNG_DEBUG > 0)
|
|
# if !defined(PNG_DEBUG_FILE) && defined(_MSC_VER)
|
|
# include <crtdbg.h>
|
|
# if (PNG_DEBUG > 1)
|
|
# ifndef _DEBUG
|
|
# define _DEBUG
|
|
# endif
|
|
# ifndef png_debug
|
|
# define png_debug(l,m) _RPT0(_CRT_WARN,m PNG_STRING_NEWLINE)
|
|
# endif
|
|
# ifndef png_debug1
|
|
# define png_debug1(l,m,p1) _RPT1(_CRT_WARN,m PNG_STRING_NEWLINE,p1)
|
|
# endif
|
|
# ifndef png_debug2
|
|
# define png_debug2(l,m,p1,p2) \
|
|
_RPT2(_CRT_WARN,m PNG_STRING_NEWLINE,p1,p2)
|
|
# endif
|
|
# endif
|
|
# else /* PNG_DEBUG_FILE || !_MSC_VER */
|
|
# ifndef PNG_STDIO_SUPPORTED
|
|
# include <stdio.h> /* not included yet */
|
|
# endif
|
|
# ifndef PNG_DEBUG_FILE
|
|
# define PNG_DEBUG_FILE stderr
|
|
# endif /* PNG_DEBUG_FILE */
|
|
|
|
# if (PNG_DEBUG > 1)
|
|
# ifdef __STDC__
|
|
# ifndef png_debug
|
|
# define png_debug(l,m) \
|
|
do { \
|
|
int num_tabs=l; \
|
|
fprintf(PNG_DEBUG_FILE,"%s" m PNG_STRING_NEWLINE,(num_tabs==1 ? " " : \
|
|
(num_tabs==2 ? " " : (num_tabs>2 ? " " : "")))); \
|
|
} while (0)
|
|
# endif
|
|
# ifndef png_debug1
|
|
# define png_debug1(l,m,p1) \
|
|
do { \
|
|
int num_tabs=l; \
|
|
fprintf(PNG_DEBUG_FILE,"%s" m PNG_STRING_NEWLINE,(num_tabs==1 ? " " : \
|
|
(num_tabs==2 ? " " : (num_tabs>2 ? " " : ""))),p1); \
|
|
} while (0)
|
|
# endif
|
|
# ifndef png_debug2
|
|
# define png_debug2(l,m,p1,p2) \
|
|
do { \
|
|
int num_tabs=l; \
|
|
fprintf(PNG_DEBUG_FILE,"%s" m PNG_STRING_NEWLINE,(num_tabs==1 ? " " : \
|
|
(num_tabs==2 ? " " : (num_tabs>2 ? " " : ""))),p1,p2);\
|
|
} while (0)
|
|
# endif
|
|
# else /* __STDC __ */
|
|
# ifndef png_debug
|
|
# define png_debug(l,m) \
|
|
do { \
|
|
int num_tabs=l; \
|
|
char format[256]; \
|
|
snprintf(format,256,"%s%s%s",(num_tabs==1 ? "\t" : \
|
|
(num_tabs==2 ? "\t\t":(num_tabs>2 ? "\t\t\t":""))), \
|
|
m,PNG_STRING_NEWLINE); \
|
|
fprintf(PNG_DEBUG_FILE,format); \
|
|
} while (0)
|
|
# endif
|
|
# ifndef png_debug1
|
|
# define png_debug1(l,m,p1) \
|
|
do { \
|
|
int num_tabs=l; \
|
|
char format[256]; \
|
|
snprintf(format,256,"%s%s%s",(num_tabs==1 ? "\t" : \
|
|
(num_tabs==2 ? "\t\t":(num_tabs>2 ? "\t\t\t":""))), \
|
|
m,PNG_STRING_NEWLINE); \
|
|
fprintf(PNG_DEBUG_FILE,format,p1); \
|
|
} while (0)
|
|
# endif
|
|
# ifndef png_debug2
|
|
# define png_debug2(l,m,p1,p2) \
|
|
do { \
|
|
int num_tabs=l; \
|
|
char format[256]; \
|
|
snprintf(format,256,"%s%s%s",(num_tabs==1 ? "\t" : \
|
|
(num_tabs==2 ? "\t\t":(num_tabs>2 ? "\t\t\t":""))), \
|
|
m,PNG_STRING_NEWLINE); \
|
|
fprintf(PNG_DEBUG_FILE,format,p1,p2); \
|
|
} while (0)
|
|
# endif
|
|
# endif /* __STDC __ */
|
|
# endif /* (PNG_DEBUG > 1) */
|
|
|
|
# endif /* _MSC_VER */
|
|
# endif /* (PNG_DEBUG > 0) */
|
|
#endif /* PNG_DEBUG */
|
|
#ifndef png_debug
|
|
# define png_debug(l, m) ((void)0)
|
|
#endif
|
|
#ifndef png_debug1
|
|
# define png_debug1(l, m, p1) ((void)0)
|
|
#endif
|
|
#ifndef png_debug2
|
|
# define png_debug2(l, m, p1, p2) ((void)0)
|
|
#endif
|
|
#endif /* PNGDEBUG_H */
|