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

Merge pull request #2943 from vbystricky:highgui_imgcodecs

Browse Source
This commit is contained in:
Vadim Pisarevsky
2014-07-10 05:28:44 +00:00
parent 0f1a0a9818 4286f60387
commit 347eaa8685
204 changed files with 968 additions and 439 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -11,7 +11,7 @@
#include "opencv2/ts.hpp"
#include "opencv2/imgproc.hpp"
#include "opencv2/highgui.hpp"
#include "opencv2/imgcodecs.hpp"
#ifdef GTEST_CREATE_SHARED_LIBRARY
#error no modules except ts should have GTEST_CREATE_SHARED_LIBRARY defined

2
modules/imgproc/test/test_precomp.hpp
View File

@@ -13,7 +13,7 @@
#include "opencv2/ts.hpp"
#include "opencv2/core/private.hpp"
#include "opencv2/imgproc.hpp"
#include "opencv2/highgui.hpp"
#include "opencv2/imgcodecs.hpp"
#include "opencv2/imgproc/imgproc_c.h"