generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into Demosaicing

Browse Source
This commit is contained in:
Ilya Lavrenov
2012-11-27 12:46:49 +04:00
parent 3fa630639f 61a40ddff8
commit 4116cbe2c0
163 changed files with 2399 additions and 1223 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/imgproc/perf/perf_precomp.hpp
View File

@@ -1,6 +1,6 @@
#ifdef __GNUC__
# pragma GCC diagnostic ignored "-Wmissing-declarations"
# ifdef __clang__
# if defined __clang__ || defined __APPLE__
# pragma GCC diagnostic ignored "-Wmissing-prototypes"
# pragma GCC diagnostic ignored "-Wextra"
# endif