[opencv] 20/71: libpng: re-apply patch

[Nobuhiro Iwamatsu]

This is an automated email from the git hooks/post-receive script.

iwamatsu pushed a commit to annotated tag 2.4.13.1
in repository opencv.

commit 7c64e03cc9a47f09cc441a9514483c246b4b4574
Author: Alexander Alekhin <alexander.alekhin at itseez.com>
Date:   Wed Jun 29 12:42:57 2016 +0300

    libpng: re-apply patch
---
 3rdparty/libpng/opencv-libpng.patch | 6 +++---
 3rdparty/libpng/pngpriv.h           | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/3rdparty/libpng/opencv-libpng.patch b/3rdparty/libpng/opencv-libpng.patch
index 6ca9639..75a6d31 100644
--- a/3rdparty/libpng/opencv-libpng.patch
+++ b/3rdparty/libpng/opencv-libpng.patch
@@ -1,8 +1,8 @@
 diff --git a/3rdparty/libpng/pngpriv.h b/3rdparty/libpng/pngpriv.h
-index 07b2b0b..e7824b8 100644
+index 8bdcccc..0f1c638 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;
+@@ -372,7 +372,7 @@
  
  /* Memory model/platform independent fns */
  #ifndef PNG_ABORT
@@ -11,7 +11,7 @@ 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;
+@@ -390,7 +390,7 @@
  #  define png_memcpy  _fmemcpy
  #  define png_memset  _fmemset
  #else
diff --git a/3rdparty/libpng/pngpriv.h b/3rdparty/libpng/pngpriv.h
index 8bdcccc..0f1c638 100644
--- a/3rdparty/libpng/pngpriv.h
+++ b/3rdparty/libpng/pngpriv.h
@@ -372,7 +372,7 @@
 
 /* Memory model/platform independent fns */
 #ifndef PNG_ABORT
-#  ifdef _WINDOWS_
+#  if defined(_WINDOWS_) && !defined(HAVE_WINRT)
 #    define PNG_ABORT() ExitProcess(0)
 #  else
 #    define PNG_ABORT() abort()
@@ -390,7 +390,7 @@
 #  define png_memcpy  _fmemcpy
 #  define png_memset  _fmemset
 #else
-#  ifdef _WINDOWS_  /* Favor Windows over C runtime fns */
+#  if defined(_WINDOWS_) && !defined(HAVE_WINRT)  /* Favor Windows over C runtime fns */
 #    define CVT_PTR(ptr)         (ptr)
 #    define CVT_PTR_NOCHECK(ptr) (ptr)
 #    define png_strlen  lstrlenA

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/opencv.git