8 Commits

Author	SHA1	Message	Date
Andrey Pavlenko	77d04a2622	Merge pull request #1844 from StevenPuttemans:bugfix_3370	2013-12-06 15:51:59 +04:00
Anatoly Baksheev	37a754621a	Fixed compilation errors: removed using namespace from hpp file. This led to pulling cv::ACCESS_MASK to global namespace where conflict with the same name in 'windows.h' ... Conflicts: apps/traincascade/boost.cpp	2013-11-27 14:53:21 +00:00
Andrey Kamaev	bef34093aa	Remove all using directives for STL namespace and members ... Made all STL usages explicit to be able automatically find all usages of particular class or function. (cherry picked from commit 2a6fb2867e) (only cherry picked "apps/trancascade")	2013-11-27 14:46:47 +00:00
StevenPuttemans	e59912f803	Applied fix mentioned in bugreport 3370. Seems to solve the issue.	2013-11-22 14:25:47 +01:00
Andrey Kamaev	81a5415417	Merged the trunk r8913	2012-07-02 15:15:40 +00:00
Andrey Kamaev	bd0e0b5800	Merged the trunk r8589:8653 - all changes related to build warnings	2012-06-15 13:04:17 +00:00
Andrey Kamaev	7fd1cfc5e7	Fixed warnings about unused return value of fread	2012-04-10 15:12:08 +00:00
Andrey Kamaev	984eb99428	Global CMake reorganization: ... [~] Automatically tracked dependencies between modules [+] Support for optional module dependencies [+] Options to choose modules to build [~] Removed hardcoded modules lists from OpenCVConfig.cmake, opencv.pc and OpenCV.mk [+] Added COMPONENTS support for FIND_PACKAGE(OpenCV) [~] haartraining and traincascade are moved outside of modules folder since they aren't the modules	2012-02-03 11:26:49 +00:00