diff options
| author | Elliott Hughes <enh@google.com> | 2023-06-23 00:54:18 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-06-23 00:54:18 +0000 |
| commit | af839e6640750ca6c799377d3c3e75f67b8e4b66 (patch) | |
| tree | 14cece6875b931c5518eb466cf363587c8a68036 /pngget.c | |
| parent | dfb0b6e960c10be916541250ac2f81845a125538 (diff) | |
| parent | b936c177bb95379a1591d1ed01e21928f00ec1a2 (diff) | |
| download | libpng-af839e6640750ca6c799377d3c3e75f67b8e4b66.tar.gz | |
Merge "Upgrade libpng to v1.6.40" am: 27bd9cf3d0 am: 6f2b0d3a5f am: edfff8897e am: b936c177bb
Original change: https://android-review.googlesource.com/c/platform/external/libpng/+/2636112
Change-Id: I07777ef3553a1014f75f4be9e93b634721117092
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'pngget.c')
| -rw-r--r-- | pngget.c | 13 |
1 files changed, 12 insertions, 1 deletions
@@ -1,7 +1,7 @@ /* pngget.c - retrieval of values from info struct * - * Copyright (c) 2018 Cosmin Truta + * Copyright (c) 2018-2023 Cosmin Truta * Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson * Copyright (c) 1996-1997 Andreas Dilger * Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc. @@ -21,7 +21,18 @@ png_get_valid(png_const_structrp png_ptr, png_const_inforp info_ptr, png_uint_32 flag) { if (png_ptr != NULL && info_ptr != NULL) + { +#ifdef PNG_READ_tRNS_SUPPORTED + /* png_handle_PLTE() may have canceled a valid tRNS chunk but left the + * 'valid' flag for the detection of duplicate chunks. Do not report a + * valid tRNS chunk in this case. + */ + if (flag == PNG_INFO_tRNS && png_ptr->num_trans == 0) + return(0); +#endif + return(info_ptr->valid & flag); + } return(0); } |