1
0
mirror of https://github.com/opencv/opencv.git synced 2026-07-25 21:33:04 +04:00
Commit Graph

1936 Commits

Author SHA1 Message Date
Vadim Pisarevsky 95ecdc3af9 Merge pull request #3600 from jet47:cuda-objdetect-module 2015-01-20 13:29:32 +00:00
Vadim Pisarevsky f647054c8c Merge pull request #3616 from marvins:gdal-fixes 2015-01-20 12:31:14 +00:00
Vadim Pisarevsky 696a6561d3 Merge pull request #3627 from cbenhagen:patch-1 2015-01-20 12:27:19 +00:00
Ben Hagen 5422cbcecb make PlaneTracker class more thread-safe 2015-01-19 21:57:23 +01:00
Ben Hagen 3f8cefea0e store user-provided data in PlaneTracker class 2015-01-19 21:51:19 +01:00
Vadim Pisarevsky 381917b762 Merge pull request #3563 from cjmayo:pyexamples 2015-01-19 11:09:58 +00:00
Vadim Pisarevsky 5cc4aa0e93 Merge pull request #3554 from wangyan42164:match_template_mask 2015-01-19 11:03:44 +00:00
Vadim Pisarevsky 225c3e78cb Merge pull request #3582 from ptzafrir:fix_samples 2015-01-19 10:53:42 +00:00
Vadim Pisarevsky 219d315c8d Merge pull request #3615 from jaybosamiya:grabcuttypo 2015-01-19 10:50:52 +00:00
Vadim Pisarevsky 3a84444488 Merge pull request #3596 from jet47:cuda-features2d-refactoring 2015-01-19 10:48:18 +00:00
Marvin Smith 91fbe00caa Updated gdal tutorial to include comments. 2015-01-17 19:28:58 -08:00
Jay Bosamiya 10cc7c78dd Fix typo 2015-01-17 22:53:30 +05:30
Yan Wang 46ed461e22 Add template match with mask.
Signed-off-by: Yan Wang <yan.wang@linux.intel.com>
2015-01-16 11:09:26 +08:00
Vadim Pisarevsky df57d038b8 Merge pull request #3572 from berak:python_samples_30 2015-01-15 13:17:26 +00:00
Tzafrir 997dded1ac add default file to load in case sample was run without command line arguments 2015-01-15 14:10:31 +02:00
Vadim Pisarevsky 16b56e71d9 Merge pull request #3561 from jet47:cuda-arithm-refactoring 2015-01-15 11:44:35 +00:00
berak fd60e98c5b fixes for latest changes in opencv3.0 api
fixes for latest changes in opencv3.0 api

waitKey() normalization

fixed mser bindings
2015-01-15 12:01:47 +01:00
Vladislav Vinogradov 734212a402 refactor CUDA CascadeClassifier 2015-01-14 19:50:05 +03:00
Vladislav Vinogradov 8257dc3c1e refactor CUDA HOG algorithm:
use abstract interface with hidden implementation
2015-01-14 19:50:05 +03:00
Vladislav Vinogradov f126f371b2 move CUDA object detection algorithms to separate module 2015-01-14 19:50:05 +03:00
Vladislav Vinogradov 8a178da1a4 refactor CUDA BFMatcher algorithm:
use new abstract interface and hidden implementation
2015-01-13 18:03:57 +03:00
Vladislav Vinogradov f960a5707d refactor CUDA ORB feature detector/extractor algorithm:
use new abstract interface and hidden implementation
2015-01-13 18:03:57 +03:00
Vladislav Vinogradov 14ef62ed66 refactor CUDA FAST feature detector algorithm:
use new FastFeatureDetector abstract interface and hidden implementation
2015-01-13 18:03:56 +03:00
Vadim Pisarevsky 2ecca8f59c Merge pull request #3566 from jet47:cuda-imgproc-refactoring 2015-01-13 11:21:51 +00:00
Basheer Subei fd1cae0dcc typo fix in instructions of fitline.py sample 2015-01-05 00:09:00 +03:00
Vadim Pisarevsky 6cb93445e1 Merge pull request #3548 from alalek:fix_sample_python 2014-12-31 09:31:33 +00:00
Vladislav Vinogradov 220d937d9a removed buffered versions of histogram functions
used BufferPool mechanism instead
2014-12-30 15:37:45 +03:00
Chris Mayo 34f0da6010 Act on INSTALL_PYTHON_EXAMPLES 2014-12-30 10:13:10 +00:00
Vladislav Vinogradov cd0e95de16 refactor cudaarithm reductions:
* remove overloads with explicit buffer, now BufferPool is used
* added async versions for all reduce functions
2014-12-30 11:06:33 +03:00
Maksim Shabunin b4050c775e Updated sample files documentation inclusions 2014-12-26 19:17:18 +03:00
Alexander Alekhin 63fc313d02 samples: fix python contants 2014-12-26 14:47:36 +03:00
Vladislav Vinogradov 53862687d5 rename CudaMem -> HostMem to better reflect its purpose 2014-12-23 17:42:49 +03:00
Vadim Pisarevsky 46858c4328 Merge pull request #3463 from Dikay900:fix_sample_video_writer 2014-12-02 09:04:27 +00:00
Dikay900 44f629f99c fix gpu sample performance test cpu part 2014-11-30 15:19:16 +01:00
Dikay900 8c919ed248 samples: gpu: fix include of TickMeter 2014-11-28 19:19:20 +01:00
Vladislav Vinogradov 1189606cd8 fix gpu performance sample compilation 2014-11-12 18:07:20 +03:00
Alexander Alekhin 2e05f1e3f8 openni_capture sample: enable OpenNI2 if available
Sample works with OpenNI2 with minimal code changes (CAP_OPENNI -> CAP_OPENNI2)
2014-11-08 02:22:29 +03:00
Vadim Pisarevsky fe4e1913f0 Merge pull request #3357 from briansp2020:master 2014-11-07 12:02:53 +00:00
Brian Park e4fa217a62 remove the unnecessary header file 2014-11-05 20:12:18 -08:00
Vadim Pisarevsky c91b0e7ac4 Merge pull request #3217 from avdmitry:samples_cpp_data 2014-11-05 14:57:46 +00:00
Vadim Pisarevsky d052d863eb Merge pull request #3315 from abak:seamless-refactor 2014-11-05 10:41:32 +00:00
Brian Park 9e3a2cbab2 check input paramter by checking the image size 2014-11-03 21:38:15 -08:00
Brian Park 5de5f26223 Merge remote-tracking branch 'upstream/master' 2014-10-29 23:15:22 -07:00
Brian Park f83a76cdeb add input paramter checking that verifies the existance of the input files to stero_match example 2014-10-21 22:47:49 -07:00
Chuanbo Weng 2b52bb092a Update hog.cpp
Update according to vbystricky's comments
2014-10-20 18:14:38 +08:00
Chuanbo Weng 7452eef6e9 Correctly enable OpenCL mode in tapi's hog example.
For current OpenCV-CL architecture, if the data buffer
allocated in UMat are cpu buffer(not ocl buffer) under
cpu mode, and then pass this UMat to an OpenCL kernel
as an argument, the OpenCL path will fail and fallback
to cpu mode. Take HOGDescriptor::oclSvmDetector as an example:
    ocl::setUseOpenCL(false);
    //data allocated in hog.oclSvmDetector will be cpu buffer
    hog.setSVMDetector(HOGDescriptor::getDaimlerPeopleDetector());
    ocl::setUseOpenCL(true);
    //We enabled OpenCL, but hog.oclSvmDetector are cpu buffer,
    //so it will fail in the function ocl_classify_hists
    //when reach to this line
    //idx = k.set(idx, ocl::KernelArg::PtrReadOnly(detector));
    hog.detectMultiScale(img, found, hit_threshold, win_stride,
            Size(0, 0), scale, gr_threshold);

Similar problems heppen on img_aux and img. So we should re-define
or re-set these UMat when do mode switch (CPU -> OpenCL) in order
to make their data be allocated by ocl and then OpenCL path will
succeed.

Signed-off-by: Chuanbo Weng <chuanbo.weng@intel.com>
2014-10-20 11:50:46 +08:00
Vadim Pisarevsky d2b9dc5530 quickly corrected the previous refactoring of features2d: moved from set(SOME_PROP, val) to setSomeProp(val) 2014-10-18 20:44:26 +04:00
Vadim Pisarevsky 1176d4ef84 fixed some more compile errors and test failures 2014-10-17 15:02:56 +04:00
Vadim Pisarevsky d36b546df8 trying to fix strange compiler bug 2014-10-17 14:56:58 +04:00
Vadim Pisarevsky 06d4aa6060 now all the samples and opencv_contrib compile! 2014-10-17 14:56:58 +04:00