Commit 842e2566 authored by Floris Berendsen's avatar Floris Berendsen
Browse files

Merge branch 'SELX-42-libpng-collision-itk-niftyreg' into develop

parents bb47f033 4c1eed99
--- a/Modules/ThirdParty/PNG/src/itkpng/itk_png_mangle.h
+++ b/Modules/ThirdParty/PNG/src/itkpng/itk_png_mangle.h
@@ -10,7 +10,7 @@ ITK.
The following command was used to obtain the symbol list:
-nm lib/libitkpng-4.9.a 2> /dev/null | grep " T \| D \| R " |
+nm lib/libitkpng-4.10.a 2> /dev/null | grep " T \| D \| R " |
awk '{ print substr($3, 1); }' | sort | awk '!/itk_/ { print }' |
sed 's \(.*\) \1\ itk_\1 ' | sed 's/^/#define /'
@@ -148,6 +148,7 @@ nm lib/libitkpng-4.9.a 2> /dev/null | grep " T \| D \| R " |
#define png_get_text itk_png_get_text
#define png_get_tIME itk_png_get_tIME
#define png_get_tRNS itk_png_get_tRNS
+#define png_get_uint_31 itk_png_get_uint_31
#define png_get_unknown_chunks itk_png_get_unknown_chunks
#define png_get_user_chunk_ptr itk_png_get_user_chunk_ptr
#define png_get_user_height_max itk_png_get_user_height_max
\ No newline at end of file
Patch for http://review.source.kitware.com/#/c/22282/
Applies to ITK 4.10 - 4.12
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment