Skip to content

O
opencv
Commit dbc0aa6c authored by Alexander Alekhin's avatar Alexander Alekhin
Browse files
Options

libpng: re-apply patch

parent 0831bd39
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 13 deletions
3rdparty/libpng/opencv-libpng.patch
View file @ dbc0aa6c
diff --git a/3rdparty/libpng/pngpriv.h b/3rdparty/libpng/pngpriv.h
index 07b2b0b..e7824b8 100644
--- a/3rdparty/libpng/pngpriv.h
+++ b/3rdparty/libpng/pngpriv.h
@@ -360,7 +360,7 @@ typedef PNG_CONST png_uint_16p FAR * png_const_uint_16pp;
@@ -457,7 +457,7 @@
/* Memory model/platform independent fns */
#ifndef PNG_ABORT
......@@ -11,12 +9,3 @@ index 07b2b0b..e7824b8 100644
# define PNG_ABORT() ExitProcess(0)
# else
# define PNG_ABORT() abort()
@@ -378,7 +378,7 @@ typedef PNG_CONST png_uint_16p FAR * png_const_uint_16pp;
# define png_memcpy _fmemcpy
# define png_memset _fmemset
#else
-# ifdef _WINDOWS_ /* Favor Windows over C runtime fns */
+# if defined(_WINDOWS_) && !defined(WINRT) /* Favor Windows over C runtime fns */
# define CVT_PTR(ptr) (ptr)
# define CVT_PTR_NOCHECK(ptr) (ptr)
# define png_strlen lstrlenA
3rdparty/libpng/pngpriv.h
View file @ dbc0aa6c
......@@ -457,7 +457,7 @@
/* Memory model/platform independent fns */
#ifndef PNG_ABORT
# ifdef _WINDOWS_
# if defined(_WINDOWS_) && !defined(WINRT)
# define PNG_ABORT() ExitProcess(0)
# else
# define PNG_ABORT() abort()
......
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