mirror of
https://github.com/opencv/opencv.git
synced 2026-07-30 15:53:03 +04:00
Alexander Alekhin
23 lines
754 B
Diff
23 lines
754 B
Diff
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
|