← Back to branch summary

~paparazzi-uav/paparazzi/v5.0-manual

« back to all changes in this revision

Viewing changes to sw/ext/opencv_bebop/opencv/3rdparty/libpng/opencv-libpng.patch

  • Committer: Paparazzi buildbot
  • Date: 2016-05-18 15:00:29 UTC
  • Revision ID: felix.ruess+docbot@gmail.com-20160518150029-e8lgzi5kvb4p7un9
Manual import commit 4b8bbb730080dac23cf816b98908dacfabe2a8ec from v5.0 branch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
sw/ext/opencv_bebop/opencv/3rdparty/libpng/opencv-libpng.patch
 
1
--- a/3rdparty/libpng/pngpriv.h
 
2
+++ b/3rdparty/libpng/pngpriv.h
 
3
@@ -457,7 +457,7 @@
 
4
 
 
5
 /* Memory model/platform independent fns */
 
6
 #ifndef PNG_ABORT
 
7
-#  ifdef _WINDOWS_
 
8
+#  if defined(_WINDOWS_) && !defined(WINRT)
 
9
 #    define PNG_ABORT() ExitProcess(0)
 
10
 #  else
 
11
 #    define PNG_ABORT() abort()