Commit Graph

19081 Commits

Author SHA1 Message Date
Vadim Pisarevsky
246b7abe7e Merge pull request #3869 from Dikay900:remove_unused_variable 2015-04-02 11:48:43 +00:00
Vadim Pisarevsky
da0e2c5bf3 Merge pull request #3889 from nitsch:fix-mingw-cmake 2015-04-02 11:45:20 +00:00
Vadim Pisarevsky
38ce0fe954 Merge pull request #3897 from sanchom:bugfix_4030 2015-04-02 11:44:32 +00:00
ippei ito
b8c00854fe instead of "using namespace cv" put all the tests into cv:: namespace. 2015-04-02 19:58:19 +09:00
Simon Heinen
d2dc7f4c27 Update android+AsyncServiceHelper.java
small formatting fixes
2015-04-02 09:05:56 +02:00
Simon Heinen
0df9dc8fb9 Update android+AsyncServiceHelper.java
changed tabs in last commit to spaces
2015-04-02 08:42:19 +02:00
Sancho McCann
6593422c05 Bugfix: #4030 SVM auto-training. 2015-04-01 20:44:51 +00:00
Dikay900
952f9dbe62 initialize tiltedOffset variable at correct location
do not use this variable if it is not an tilted feature
2015-04-01 20:32:30 +02:00
Vadim Pisarevsky
ba0a8dc723 Merge pull request #3783 from StevenPuttemans:fix_traincascade_getNegatives 2015-04-01 13:56:29 +00:00
Vadim Pisarevsky
100c2dd91c Merge pull request #3852 from renko:multithread_cl_not_studio_generator 2015-04-01 13:25:39 +00:00
Vadim Pisarevsky
5ab26e3202 Merge pull request #3874 from paroj:calib_sample 2015-04-01 11:13:05 +00:00
Vadim Pisarevsky
6aaa6a50e3 Merge pull request #3887 from MSOpenTech:update_py_script 2015-04-01 11:05:56 +00:00
Vladimir Kolesnikov
58c9135626 Not block PDB file in multithreaded build on Windows.
If used cl compiler, but generator is not Visual Studio e.g. Ninja,
enable FS option to prevent blocking PDB file in multithreaded build.
2015-04-01 13:52:07 +03:00
Vadim Pisarevsky
80c79d4021 Merge pull request #3891 from mshabunin:fix-v4l2-link 2015-04-01 10:49:52 +00:00
Evgeny Agafonchikov
ae090fe10d Functionality for relocation of tests
This allows to start run.py with --move_tests parameter to place tests

to another location and keep them runnable from there
2015-04-01 11:50:05 +03:00
Evgeny Agafonchikov
1f04f9d63b Fixing help messages
--help message and starting run.py w/o parameters generate different messages

E. g. w/ and w/o build_path in the end

build_path is required, removing square brackets
2015-03-31 17:58:25 +03:00
Maxim Kostin
75850a1351 Added sample imgcodecs logic to winrt sample app
- Made use imread() in OcvImageProcessing sample.
 - Added test/sample logic to verify file creation via imgcodecs.

Signed-off-by: Maxim Kostin <v-maxkos@microsoft.com>
2015-03-31 17:09:09 +03:00
Pavel Rojtberg
7c5084e385 - update documentation
* correct the part about fixed aspect
    * improve formatting
    * add snippet markers to source
    * replace inline code by @snippet
  - do not run calibration twice when using a imageList
  - make output consistent in itself (CamelCase vs no_camel_case) as well as with old camera calibrate sample
  - respect write extrinsic/ points flags
  - set the aspectRatio value when specified
  - fix writing of calibration settings. also update grammar.
  - fix intendation and remove some size_t -> int casts by using size_t
2015-03-31 15:45:57 +02:00
Maxim Kostin
412a2aa4ab Added support for 'imgcodecs' module:
- Resolved GET_ENV and input type incompatibility
 - Made libjpeg compile for WINRT. So does imgcodecs module.
 - Updated .gitignore (log, tlog)
2015-03-31 16:31:37 +03:00
Roman Donchenko
6e121b2e29 Use imported targets for linking to CUDA
This retains the desirable quality of not including paths to CUDA libraries
from the build system into the config files, and has two major advantages:

* It removes the need to use link_directories, which doesn't guarantee that
  the libraries from the supplied directory will be used (there may be
  libraries with the same names earlier in the search path).

* It removes the need to put -L entries into OPENCV_LINKER_LIBS. This variable
  is used with target_link_libraries, where such entries are treated as linker
  flags, so doing this is unportable. I remove the support for -L entries
  from OpenCVGenPkgconfig.cmake, as well, to discourage adding them in the
  future.
2015-03-31 13:46:28 +03:00
Roman Donchenko
149c1c16ba cap_libv4l.cpp depends on both libv4l 1 and 2, so search for both
How this worked before, I do not know.
2015-03-31 12:41:50 +03:00
Alexander Nitsch
afd9de6f1b Fix static/shared lib detection
The check for BUILD_SHARED_LIBS had its logic backwards. If this
variable is not defined we must assume a build of static libs.
2015-03-31 00:05:49 +02:00
Alexander Nitsch
66e653d24d Remove local variables from CMAKE namespace 2015-03-31 00:05:48 +02:00
Alexander Nitsch
3fff0e5b3c Fix MinGW detection on x86
Make detection of x64 using the gcc's target triplet identical
to the one used in cmake/OpenCVDetectCXXCompiler.cmake.
Otherwise, MinGW-w64 setups will always be treated as x64 since
they contain "w64" as vendor key.
2015-03-31 00:05:48 +02:00
Alexander Nitsch
8f84a73b82 Fix MinGW architecture detection
Fix typo that would always lead to detection of x86 for MinGW
builds in the OpenCVConfig.cmake file.
2015-03-31 00:05:47 +02:00
Alexander Nitsch
2e86cedef2 Fix MinGW detection on x86
MinGW-w64 always uses "w64" as vendor key which the previously
used check for "64" anywhere in the target triplet matched. This
would lead to MinGW-w64 setups always being treated as x64.

Turns out we do not even need this additional check since the
architecture has been correctly determined earlier in this file.
No need to do it again.
2015-03-31 00:02:03 +02:00
Vadim Pisarevsky
864b4e3b26 Merge pull request #3873 from Dmitry-Me:reduceVariableScope10 2015-03-30 17:20:39 +00:00
Alexander Alekhin
13a9d4a61f Merge pull request #3888 from alalek:fix_build 2015-03-30 15:52:05 +00:00
Alexander Alekhin
d326c77007 fix build (related to PR #3814) 2015-03-30 16:32:00 +03:00
Roman Donchenko
e6619cf580 Move the CUDA searching code in OpenCVConfig.cmake.in out of the foreach loop
There's no reason to do it twice.
2015-03-30 15:04:27 +03:00
Roman Donchenko
122b9f8e17 Turn ocv_convert_to_lib_name into a function 2015-03-30 14:58:37 +03:00
Vadim Pisarevsky
4b0543c887 Merge pull request #3883 from kmsquire:python_cmake_fix 2015-03-30 09:38:18 +00:00
Vadim Pisarevsky
fa9c9e791b Merge pull request #3876 from vpisarev:mjpeg_codec 2015-03-30 09:27:10 +00:00
Vadim Pisarevsky
ff682a30b3 Merge pull request #3872 from mshabunin:add-rst-link 2015-03-30 09:13:26 +00:00
Vadim Pisarevsky
d948b2a235 Merge pull request #3886 from beahacker:2.4 2015-03-30 09:09:31 +00:00
howtobeahacker
ebd7d08408 fix bug 4269 2015-03-30 00:01:20 +08:00
Alexander Alekhin
d279f127c1 Merge pull request #3884 from mshabunin:fix-vc10-build 2015-03-27 18:03:37 +00:00
Vadim Pisarevsky
602d2c33c0 added video writer quality, which user may change dynamically in the case of motion jpeg; enabled NEON intrinsics in the encoder 2015-03-27 15:15:59 +03:00
ippei ito
140051b18c Merge remote-tracking branch 'origin/2.4-flann-lsh-addable-index' into 2.4-flann-lsh-addable-index 2015-03-27 20:55:59 +09:00
ippei ito
b7276359e9 Test accuracy for PR#3829 2015-03-27 20:54:05 +09:00
Maksim Shabunin
56b02331f7 Commented unused constants in the RHO algorithm 2015-03-27 14:36:27 +03:00
Maksim Shabunin
fab2a947ca Fix build for VC10 2015-03-27 12:15:26 +03:00
Kevin Squire
5e354fa844 Allow PYTHON_LIBRARY and PYTHON_INCLUDE_DIR to actually be overridden 2015-03-26 17:48:03 -07:00
Vadim Pisarevsky
77cbddf715 Merge pull request #3847 from mshabunin:android-build 2015-03-26 16:56:49 +00:00
Vadim Pisarevsky
83d6d70a56 Merge pull request #3855 from polarfuchs99:2.4 2015-03-26 16:55:30 +00:00
Vadim Pisarevsky
1381564a84 Merge pull request #3880 from vpisarev:fix_emd 2015-03-26 16:40:17 +00:00
Vadim Pisarevsky
10e0540e61 Merge pull request #3871 from potpath:patch-1 2015-03-26 13:35:35 +00:00
Vadim Pisarevsky
b123870871 Merge pull request #3868 from Dikay900:fix_cudalegacy_without_cudaimgproc 2015-03-26 13:35:12 +00:00
Vadim Pisarevsky
b91313a84e initialize the output flow in EMD (thanks to Daniel DeMenthon for the bug report) 2015-03-26 16:26:41 +03:00
Vadim Pisarevsky
eff302a231 Merge pull request #3875 from alalek:fix_build 2015-03-26 13:09:01 +00:00