Commit Graph

15781 Commits

Author SHA1 Message Date
StevenPuttemans
0833352660 add annotation tool master branch 2015-02-25 11:31:50 +01:00
Dmitry-Me
2311504c44 Reduce variables scope 2015-02-25 10:38:44 +03:00
Alexander Alekhin
52effe9e72 Android: fix JavaCameraView implementation
1) Fixed deadlock if camera is started and stopped immediately
2) Invalid pattern usage of Object.wait(). Refer to "spurious wakeup": http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html#wait
3) Fixed buffer usage:
  a) fix eliminates processing of zero NV12 (green in RGB) first frame
  b) latest ready frame is delivered for processing (not previous)
2015-02-24 18:52:54 +03:00
Vadim Pisarevsky
bdb088dcca Merge pull request #3712 from jet47:fix-cuda-build-on-windows 2015-02-24 15:39:01 +00:00
Vadim Pisarevsky
457758b537 Merge pull request #3733 from StevenPuttemans:fix_4004_master 2015-02-24 15:38:40 +00:00
Vadim Pisarevsky
b64b82a1ef Merge pull request #3734 from Dmitry-Me:reduceVariableScope2 2015-02-24 15:38:19 +00:00
Vadim Pisarevsky
0016f6d73d Merge pull request #3736 from nisargthakkar:Bug3634_master 2015-02-24 15:38:02 +00:00
Vadim Pisarevsky
5dc569866e Merge pull request #3743 from StevenPuttemans:fix_3887_master 2015-02-24 15:37:13 +00:00
theodore
96c824f375 Morphology Lines Extraction Tutorial 2015-02-24 14:33:15 +01:00
Vadim Pisarevsky
90fb43cd11 Merge pull request #3709 from StevenPuttemans:fix_traincascade_load_message_master 2015-02-24 12:50:38 +00:00
Alexander Smorkalov
1a795ac2ea Merge pull request #3738 from ilya-lavrenov:cc_master 2015-02-24 10:47:20 +00:00
Maksim Shabunin
1fe1ebf20c Merge pull request #3728 from StevenPuttemans:fix_3714_master 2015-02-24 10:09:22 +00:00
Maksim Shabunin
02488215e6 Merge pull request #3741 from StevenPuttemans:fix_3028_master 2015-02-24 10:05:16 +00:00
Eric Sommerlade
998a909705 fixed whitespace issues 2015-02-23 08:15:34 -07:00
StevenPuttemans
6902fa6b1c fix formula getGaussianKernel in docs 2015-02-23 15:23:02 +01:00
StevenPuttemans
370389c7af add extra output argument to tutorial 2015-02-23 15:13:33 +01:00
StevenPuttemans
7401b02022 fix ellipse fitting notice 2015-02-23 15:05:55 +01:00
Eric Sommerlade
a07d7a70a0 added support for uncompressed parameters to tiff image format as described here: expertland.net/question/b6o3n6p9a72341db823b48nl98m91dx8n1/detail.html 2015-02-23 06:12:42 -07:00
Ilya Lavrenov
58b3869730 fixed cross-compilation 2015-02-22 13:20:37 +03:00
Alexander Alekhin
08dd1e085b Merge pull request #3730 from ilya-lavrenov:fix_bug 2015-02-21 08:10:25 +00:00
Nisarg Thakkar
b8f65d0252 Same as Bug #3309. Pushing to master 2015-02-21 09:20:00 +05:30
Eric Sommerlade
6447c7b2f4 Merge pull request #1 from Itseez/master
Update from original
2015-02-20 17:21:38 +00:00
Dmitry-Me
53566f2ec0 Reduce variable scope, fix indenting 2015-02-20 17:46:48 +03:00
StevenPuttemans
ea54c01125 add remarks for iOS tutorial 2015-02-20 14:30:11 +01:00
Ilya Lavrenov
5f7a994ad1 fixed internal compiler error 2015-02-20 15:46:22 +03:00
StevenPuttemans
350dccf84a fix error 3714 2015-02-20 13:30:40 +01:00
berak
c83044d45a fix houghlines.py sample and tutorial
fix whitespace
2015-02-20 10:51:52 +01:00
Vadim Pisarevsky
7b270f4c69 Merge pull request #3679 from mshabunin:remove-algorithm-factory 2015-02-19 18:43:58 +00:00
Vadim Pisarevsky
0a1da4461b Merge pull request #3718 from mshabunin:image-max-width 2015-02-19 18:36:27 +00:00
Vadim Pisarevsky
aec8fd3243 Merge pull request #3719 from theodr:document_findnonzero_function 2015-02-19 18:36:09 +00:00
theodore
cfccdc9b0c documenting findnonzero() function 2015-02-19 17:57:52 +01:00
theodore
453f384bd7 adding documentation for the findnonzero() function 2015-02-19 17:38:44 +01:00
theodore
4a1adab9b4 Merge branch 'master' of https://github.com/theodr/opencv 2015-02-19 13:28:03 +01:00
Dmitry-Me
98a8045aaf Reduce variable scope 2015-02-19 13:10:02 +01:00
Nisarg Thakkar
e6876fecd3 Fixed doc error in optical flow 2015-02-19 13:10:02 +01:00
Dmitry-Me
c4c3e4fe83 Remove unneeded indirections 2015-02-18 18:25:17 +03:00
Maksim Shabunin
e57359a3a0 Documentation: set max-width property for inserted images 2015-02-18 18:19:36 +03:00
Vadim Pisarevsky
6ff2f395e6 Merge pull request #3702 from Dmitry-Me:reduceVariableScope 2015-02-18 13:55:58 +00:00
Vadim Pisarevsky
009ab70272 Merge pull request #3711 from nisargthakkar:optical_flow_doc_fix 2015-02-18 13:52:09 +00:00
Vadim Pisarevsky
b64e106bb1 Merge pull request #3703 from BKNio:fixing_bad_alloc 2015-02-18 13:50:14 +00:00
Vadim Pisarevsky
1d356b6a48 Merge pull request #3714 from uqtimes:fixUIImageToMat 2015-02-18 13:49:14 +00:00
Vadim Pisarevsky
6b371865af Merge pull request #3716 from mshabunin:fix-vs-solution-build 2015-02-18 13:48:18 +00:00
Vadim Pisarevsky
87f86b31fa Merge pull request #3715 from mshabunin:enable-stl 2015-02-18 12:12:14 +00:00
Vadim Pisarevsky
4f8bf98e6f Merge pull request #3706 from exeltior:patch-1 2015-02-18 11:30:05 +00:00
Maksim Shabunin
2085251df2 Exclude object libraries from visual studio solution build 2015-02-18 14:16:54 +03:00
Maksim Shabunin
c41db69f98 Fixed cmake issues 2015-02-18 12:44:48 +03:00
Maksim Shabunin
553020c448 Enabled STL usage within the library 2015-02-18 12:36:50 +03:00
UQ Times
1944443d10 iOS: fix crash from overrelease in UIImageToMat
- previous pull request: https://github.com/Itseez/opencv/pull/3340
2015-02-18 13:30:08 +09:00
Vladislav Vinogradov
671b59aa9d fix windows build with CUDA
rename cv::cuda::internal namespace
to cv::cuda::device to prevent conflicts
with cv::internal
2015-02-17 21:50:39 +03:00
Nisarg Thakkar
437ef99ba5 Fixed doc error in optical flow 2015-02-17 22:14:57 +05:30