opencv/3rdparty/libpng/opencv-libpng.patch

--- a/3rdparty/libpng/pngpriv.h
+++ b/3rdparty/libpng/pngpriv.h
@@ -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()
Restricted Win32 API was fixed in Highgui and some 3rd party libs. Patch for libpng added. 2013-08-12 15:30:40 +02:00			`--- a/3rdparty/libpng/pngpriv.h`
			`+++ b/3rdparty/libpng/pngpriv.h`
libpng: re-apply patch 2015-12-10 12:04:11 +01:00			`@@ -457,7 +457,7 @@`
Restricted Win32 API was fixed in Highgui and some 3rd party libs. Patch for libpng added. 2013-08-12 15:30:40 +02:00
			`/* Memory model/platform independent fns */`
			`#ifndef PNG_ABORT`
			`-# ifdef _WINDOWS_`
Adding support for WinRT(WinPhone 8/8.1 and Win Store) via CMake 3.1 - Substituted HAVE_WINRT with WINRT - Fixed compilation issues in ocl.cpp and parallel.cpp - Fixed compiler issue for WP8: "C2678: binary '+' : no operator found which takes a left-hand - Fixed gitignore - Added #ifdef HAVE_OPENCL to remove compiler warnings in ocl.cpp - Used NO_GETENV similar to '3rdparty\libjpeg\jmemmgr.c; - Added ole32.lib for core module (for WindowsStore 8.0 builds) - Made OpenCV_ARCH aware of ARM Signed-off-by: Maxim Kostin <v-maxkos@microsoft.com> 2015-02-20 17:47:45 +01:00			`+# if defined(_WINDOWS_) && !defined(WINRT)`
Restricted Win32 API was fixed in Highgui and some 3rd party libs. Patch for libpng added. 2013-08-12 15:30:40 +02:00			`# define PNG_ABORT() ExitProcess(0)`
			`# else`
			`# define PNG_ABORT() abort()`