diff options
| author | Frederik Gladhorn <frederik.gladhorn@qt.io> | 2019-05-07 14:51:25 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@qt.io> | 2019-05-07 14:51:25 +0200 |
| commit | 4f5b2733b6e8be08177de628da55b8b22db9f707 (patch) | |
| tree | ae5c1f1ca36b070211920e8878c9c80e0b6fbda4 /src/3rdparty/libpng/pngpriv.h | |
| parent | ac68ef1efc27669e9c8fc255298345d72d198d68 (diff) | |
| parent | 050e7bafad3b723fe5be6e981a32e708dbdc5150 (diff) | |
Merge 5.13 into 5.13.0
Change-Id: I98e2b93d78dba1cbf746c39a0b5877d5e72c91fc
Diffstat (limited to 'src/3rdparty/libpng/pngpriv.h')
| -rw-r--r-- | src/3rdparty/libpng/pngpriv.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/3rdparty/libpng/pngpriv.h b/src/3rdparty/libpng/pngpriv.h index f53c81d039..2ab9b70d73 100644 --- a/src/3rdparty/libpng/pngpriv.h +++ b/src/3rdparty/libpng/pngpriv.h @@ -1,7 +1,7 @@ /* pngpriv.h - private declarations for use inside libpng * - * Copyright (c) 2018 Cosmin Truta + * Copyright (c) 2018-2019 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. @@ -2133,11 +2133,11 @@ PNG_INTERNAL_FUNCTION(png_uint_32, png_check_keyword, (png_structrp png_ptr, #if PNG_ARM_NEON_IMPLEMENTATION == 1 PNG_INTERNAL_FUNCTION(void, - png_riffle_palette_rgba, - (png_structrp, png_row_infop), + png_riffle_palette_neon, + (png_structrp), PNG_EMPTY); PNG_INTERNAL_FUNCTION(int, - png_do_expand_palette_neon_rgba, + png_do_expand_palette_rgba8_neon, (png_structrp, png_row_infop, png_const_bytep, @@ -2145,7 +2145,7 @@ PNG_INTERNAL_FUNCTION(int, const png_bytepp), PNG_EMPTY); PNG_INTERNAL_FUNCTION(int, - png_do_expand_palette_neon_rgb, + png_do_expand_palette_rgb8_neon, (png_structrp, png_row_infop, png_const_bytep, |