Andrey Kamaev
3d3385654a
Use C++ style includes when compiled as C++
2013-03-25 16:01:06 +04:00
Andrey Kamaev
5c327030eb
Merge pull request #698 from vpisarev/ms_visimage_tut24
...
added tutorial by Wolf Kienzle on using "image watch" plugin for ms visual studio
2013-03-25 03:29:13 -07:00
Andrey Kamaev
04ec0bdbf0
Merge pull request #697 from Nerei/ios_png_jpeg
...
Enabled png and jpeg for iOS
2013-03-25 03:28:29 -07:00
Andrey Kamaev
8c41c614eb
Merge pull request #700 from cuda-geek/fix_build_with_cuda
...
fix master build with CUDA after latest 2.4 merge
2013-03-25 03:27:31 -07:00
Andrey Kamaev
04eabf8d9f
Merge pull request #699 from jacob-baines/patch-1
...
Mismatching new[] / delete
2013-03-25 03:26:18 -07:00
Andrey Kamaev
bafd359083
Merge pull request #695 from taka-no-me/cv_str
...
cv::String to replace the std::string
2013-03-25 03:24:42 -07:00
Andrey Kamaev
a3994bc45f
Merge pull request #671 from cuda-geek/static_assert
...
Static assert
2013-03-25 03:23:20 -07:00
Vadim Pisarevsky
f8b61e4eca
fixed hopefully last warnings in the doc builder
2013-03-25 12:04:11 +04:00
Anatoly Baksheev
7fa01e3fcc
enabled png and jpeg for iOS
2013-03-25 11:19:29 +04:00
marina.kolpakova
dd9e786a8e
fix build gpu tests after video module refactoring
2013-03-25 09:34:51 +04:00
marina.kolpakova
84f45e1e03
fixed build with CUDA after latest merge
2013-03-25 08:08:36 +04:00
Jacob Baines
1e1645e214
Mismatching new[] / delete
2013-03-24 22:45:31 -03:00
Vadim Pisarevsky
44157c421f
fixed python test failures (modified stereo correspondence test to use cv2.* stuff), fixed docs
2013-03-25 00:42:46 +04:00
marina.kolpakova
4096b54560
use static assertation where suitable
2013-03-25 00:29:12 +04:00
marina.kolpakova
5c1c13e745
static assert
2013-03-25 00:29:12 +04:00
Vadim Pisarevsky
2be7d9b4d5
added tutorial by Wolf Kienzle on using "image watch" plugin for ms visual studio
2013-03-24 23:48:35 +04:00
Vadim Pisarevsky
7b5923e98b
fixed docs and compile error on Linux
2013-03-24 23:09:17 +04:00
Andrey Kamaev
877dfae044
Fix build of ocl module
2013-03-22 22:14:57 +04:00
Andrey Kamaev
33ef7990b0
Update documentation
2013-03-22 22:14:54 +04:00
Andrey Kamaev
be7bbe3aa9
Drop cv:: prefix from cv::String used inside the cv namespace
2013-03-22 22:14:50 +04:00
Andrey Kamaev
75513a46dc
Remove all include directives for <string>
2013-03-22 22:14:47 +04:00
Andrey Kamaev
29b544d83c
Use cv::String in Android camera wrapper
2013-03-22 22:14:43 +04:00
Andrey Kamaev
3088808926
Fix build of various backends
2013-03-22 22:14:40 +04:00
Andrey Kamaev
29cfeb7cee
Fix build of apps and samples
2013-03-22 22:14:36 +04:00
Andrey Kamaev
688d170de7
Java wrapper is adapted for cv::String
2013-03-22 22:14:33 +04:00
Andrey Kamaev
707d3e0a62
Python wrapper is adapted for cv::String
2013-03-22 22:14:30 +04:00
Andrey Kamaev
2ad7b97f1c
All modules (except ocl and gpu) compiles and pass tests
2013-03-22 22:14:26 +04:00
Andrey Kamaev
762aefd71b
Compile opencv_test_core with cv::String instead of std::string
...
All tests passed!
2013-03-22 22:14:22 +04:00
Andrey Kamaev
14bb4cbe1e
Add cv::String class
2013-03-22 22:14:18 +04:00
Misty De Meo
a423afddc1
Fix ant/Java detection in cmake scripts
...
Mac OS X 10.7 and newer don't come with Java installed. They do
include some stub binaries, which ask the user if they want to
install Java when run.
OpenCV's cmake script just checks for the existence of an ant
binary and assumes that Java's available if ant is. As a result,
cmake will configure the build to use Java and it will fail once
it tries to compile the Java bindings.
This fixes the issue by checking for the exit status of
`ant -version` - it exits 0 if Java is installed, or 1
otherwise.
2013-03-22 11:18:42 -05:00
Andrey Kamaev
ec15d6f383
Merge pull request #690 from berak:master
2013-03-22 19:35:17 +04:00
Andrey Kamaev
82d7292ee7
Merge pull request #680 from vpisarev:c2cpp_video_take2
2013-03-22 19:34:53 +04:00
Andrey Kamaev
ec8aec09ec
Merge pull request #691 from vpisarev:fix_2899
2013-03-22 17:18:55 +04:00
Andrey Kamaev
2c9f651230
Merge pull request #688 from jet47:fix-nonfree-compilation
2013-03-22 17:18:40 +04:00
Andrey Kamaev
c6eb7c3b12
Merge pull request #683 from jet47:gpu-license
2013-03-22 17:18:15 +04:00
Vadim Pisarevsky
a4815cf359
removed extra whitespaces
2013-03-22 15:12:55 +04:00
Vadim Pisarevsky
38693ef37c
fixed http://code.opencv.org/issues/2899
2013-03-22 15:10:54 +04:00
Vadim Pisarevsky
5febc07b6b
Merge pull request #687 from vpisarev:fast_lin_svm2
2013-03-22 14:34:45 +04:00
Vladislav Vinogradov
f0b19d4659
updated license header in whole gpu module
2013-03-22 14:03:15 +04:00
berak
d32af86e75
Update CMakeLists.txt
...
exclude IlmImf/b44ExpLogTable.cpp from the build,
it's used originally to generate IlmImf/b44ExpLogTable.h, but not nessecary for the library.(probably only here for documentation
when included with static linking it introduces a problem with multiple definitions of main()
2013-03-22 09:31:40 +01:00
Vladislav Vinogradov
3ef2e1136f
fixed nonfree compilation with gpu (perf tests)
2013-03-22 10:20:57 +04:00
Vadim Pisarevsky
e01335bf47
fixed buffer size and restored the use of compressed files in ml's load_save tests.
2013-03-22 01:53:41 +04:00
Vadim Pisarevsky
40dd25d6c2
restored CV_EXPORTS_W in the background subtraction classes
2013-03-22 01:29:33 +04:00
Vadim Pisarevsky
7661625c39
converter stereo correspondence algorithms to the new style
2013-03-22 01:05:30 +04:00
Andrey Kamaev
1ca8f33b4e
Merge branch '2.4'
2013-03-21 23:11:54 +04:00
Vadim Pisarevsky
d310ccad0a
fixed documentation and warnings on Windows
2013-03-21 20:23:52 +04:00
Andrey Kamaev
b6365699ee
Merge pull request #664 from taka-no-me/ocl
...
Move OpenCL SURF to nonfree module
2013-03-21 09:01:59 -07:00
Andrey Kamaev
07cd18adaf
Merge pull request #686 from taka-no-me/stereobm_sobel
...
Fixed wrong index in prefilterXSobel function
2013-03-21 08:59:59 -07:00
Andrey Kamaev
8a962d348e
Merge pull request #676 from vpisarev/svd_stuff
...
added test for bug #1448 and hopefully fixes the bug #2898
2013-03-21 08:59:48 -07:00
Andrey Kamaev
172b4554f3
Merge pull request #675 from jet47/gpu-test-fixes
...
GPU test fixes
2013-03-21 08:59:34 -07:00
