summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 0831bd3)
raw | patch | inline | side by side (parent: 0831bd3)
author | Alexander Alekhin <alexander.alekhin@itseez.com> | |
Thu, 10 Dec 2015 11:04:11 +0000 (14:04 +0300) | ||
committer | Alexander Alekhin <alexander.alekhin@itseez.com> | |
Fri, 11 Dec 2015 09:06:24 +0000 (12:06 +0300) |
3rdparty/libpng/opencv-libpng.patch | patch | blob | history | |
3rdparty/libpng/pngpriv.h | patch | blob | history |
index 9bc0b69037d6eacbc1e086d8557d980478b315d1..9fac20355e6472bd466d90d18d13fefa1c2fdc4f 100644 (file)
-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
# 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
index c466d4bfe9a942b0c4847a8ce34319af524ab644..e30b0434ac9b043e46af4003055e490625a41476 100644 (file)
/* 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()