Fedor Morozov
89508bf7ab
NO exr now
2013-09-17 00:46:15 +04:00
Fedor Morozov
76c6fa9348
No EXR in tests
2013-09-17 00:39:22 +04:00
Ilya Lavrenov
6a26c4483f
added performance tests for data transfer operations
2013-09-16 23:51:36 +04:00
Ilya Lavrenov
58b84c2fc0
removed needless divUp
2013-09-16 15:48:30 +04:00
look4pritam
a430abd02e
The thin prism distortion coefficient related small bug is fixed.
2013-09-16 13:39:11 +05:30
Ovidiu Parvu
b570a4ac47
Added the C interface function signature and the overloaded minEnclosingTriangle Python function to the documentation.
2013-09-15 23:40:40 +01:00
Ovidiu Parvu
130b4d8e26
Changed the return type of cvMinEnclosingTriangle to CVAPI(void). Added the implementation of the function to the min_enclosing_triangle.cpp source file.
2013-09-15 23:25:36 +01:00
Ovidiu Parvu
7ac768651f
Added the signature cvMinEnclosingTriangle (C version) to the imgproc_c.h header
2013-09-15 22:40:57 +01:00
Ovidiu Parvu
0117d77cd1
Added the tests for the minEnclosingTriangle function in the existing test_convhull.cpp file.
2013-09-15 22:25:58 +01:00
Ilya Lavrenov
e0325fe057
removed useless output
2013-09-15 22:04:22 +04:00
Ilya Lavrenov
a5c9d83617
fixed ocl::pyrUp for 2-byte types
2013-09-15 19:56:05 +04:00
Ozan Tonkal
3165b526f2
merge with Itseez/opencv
2013-09-15 17:51:27 +02:00
Ozan Tonkal
c31fb8ffff
rename widgets from *Widgets to W*
2013-09-15 16:26:53 +02:00
Ovidiu Parvu
caaa9e0f2d
- Wrote the documentation for the minEnclosingTriangle function (+1 extra picture depicting a sample output)
2013-09-15 15:07:17 +01:00
Alexander Alekhin
0ee47502d9
remove CV_EXPORT from templates
2013-09-15 13:48:54 +04:00
Ozan Tonkal
f570b3e18d
cmake check if VTK version is lower than 5, and give fatal error if it is
2013-09-15 11:24:20 +02:00
hbristow
86b7e3d15d
Moved Jinja2 into 3rdparty. Now using latest stable version from pypi (2.7.1)
2013-09-15 17:36:13 +10:00
lluis
d25309f82e
first parameter of createERFilterNM1/createERFilterNM2 is now mandatory. changed the sample program to use the new prototypes
2013-09-13 16:29:21 +02:00
lluis
75fdfba281
renamed getDefaultClassifierNM{1,2}() to loadClassifierNM{1,2}() and added "const std::string& filename" parameter (mandatory).
2013-09-13 16:19:52 +02:00
Roman Donchenko
671e5e39b1
Dropped the HAVE_DC1394_095 configuration macro.
...
We never set it, and libdc1394 0.9.5 is obsolete anyway - 1.0 came out
in 2004.
Note that 1.0 doesn't have the do_extra_buffering parameter.
2013-09-13 17:25:21 +04:00
Roman Donchenko
eff21788a8
Merge pull request #1445 from vpisarev:stereocalib_quick_fix
2013-09-13 15:01:14 +04:00
lluis
95d92c099c
functions getDefaultClassifierNM1() and getDefaultClassifierNM2() allow to implicitly load the default classifiers when creating a ERFilter object
2013-09-13 12:54:23 +02:00
Vadim Pisarevsky
84022b0c19
fix thin-prism coefficients at 0's in the stereo calibration function unless the flag CALIB_THIN_PRISM_MODEL is explicitly set
2013-09-13 13:32:42 +04:00
Roman Donchenko
c511d5d649
Merge pull request #1414 from lluisgomez:scene_text_detection_computeNMChannels
2013-09-13 13:31:14 +04:00
Roman Donchenko
0033d453f2
Merge pull request #1426 from nailbiter:optimPD
2013-09-13 13:27:02 +04:00
Roman Donchenko
e3b92a9591
Merge pull request #1441 from look4pritam:prism-stereo
2013-09-13 13:17:06 +04:00
Ilya Lavrenov
9311f84109
disabled MOG tests if no video input support
2013-09-13 12:47:25 +04:00
hbristow
530ad447bc
Added fixes to CMakeLists.txt
2013-09-13 17:22:12 +10:00
Ovidiu Parvu
8bada4c751
Overloaded the minEnclosingTriangle function such that there is an alternative function with the same name which does not require the output parameter ``area''.
...
Changed the sample source file minarea.cpp to use the overloaded version of the function.
Updated some comments in the min_enclosing_triangle.cpp source file.
2013-09-12 23:47:48 +01:00
Ozan Tonkal
3f27ba54e0
re-render the scene after changing camera properties
2013-09-12 19:23:05 +02:00
Ovidiu Parvu
0ed2f6201d
Optimised one assert statement in the min_enclosing_triangle.cpp file. Added the minEnclosingTriangle functionality to the existing minarea.cpp sample file.
2013-09-12 15:01:21 +01:00
Ovidiu Parvu
9902affae6
Added some assert statements to constrain the type of the input and output parameters. Convert the input set of points to vector<Point2f> before passing it to the findMinimumAreaEnclosingTriangle function.
2013-09-12 14:34:08 +01:00
Roman Donchenko
e3710488a8
Merge pull request #1434 from melody-rain:Added_perf_kalman_cpp
2013-09-12 16:54:21 +04:00
Roman Donchenko
d669559ec3
Bumped version to 3.0.
2013-09-12 16:40:14 +04:00
Roman Donchenko
b525c28244
Updated the Java bindings and docs to support the version status.
2013-09-12 16:39:14 +04:00
Ovidiu Parvu
4fce8e6b0e
Changed the semantics of the minEnclosingTriangle function such that:
...
1. The function receives a set of points as input instead of a convex polygon with more than three vertices
2. The convex hull P is computed inside the function
3.1. If the number of vertices of P is greater than three then the algorithm which was implemented before executes
3.2. Otherwise the vertices of the triangle are picked from the vertices of the given polygon and the area computed
2013-09-12 13:29:10 +01:00
Roman Donchenko
887825e831
Added an additional version component - the development status.
...
This will allow us to distinguish between regular releases, prereleases
and development versions.
2013-09-12 16:20:09 +04:00
Roman Donchenko
dee2a65978
Merge pull request #1440 from SpecLad:wcast-align
2013-09-12 13:56:23 +04:00
look4pritam
7fd7bbc9f1
The prism distortion coefficients are added for the stereo calibration.
2013-09-12 15:17:11 +05:30
Ovidiu Parvu
510ad8e779
- Changed the type of the minEnclosingTriangle function parameters by using proxy classes InputArray/OutputArray instead of std::vector<T>
...
- Adapted the source code to accommodate this change
2013-09-12 10:11:38 +01:00
Roman Donchenko
ad52dd37a9
Revert "Merge pull request #1376 from StevenPuttemans:bugfix_3186"
...
This reverts commit 41b8479d03
, reversing
changes made to 531471b0aa
.
Reason: breaks the build.
2013-09-12 12:58:10 +04:00
Roman Donchenko
ac9bc6423a
Merge pull request #1428 from ilya-lavrenov:ocl_pyr
2013-09-12 12:48:45 +04:00
Ilya Lavrenov
f20cc2bce8
extended ocl::convertTo
2013-09-12 12:39:03 +04:00
Roman Donchenko
fec697b390
Silenced a few -Wcast-align warnings in the headers.
...
We don't use -Wcast-align ourselves, but the headers trigger warnings
for those users who do, which is not nice.
2013-09-12 12:33:56 +04:00
Roman Donchenko
f31d06f980
Merge pull request #1418 from vpisarev:24_ipp_sepfilter_dft
2013-09-12 12:19:37 +04:00
Jin Ma
f4d0c9b13c
Revised the code according to the feedback of the community.
2013-09-12 09:43:30 +08:00
Ovidiu Parvu
e6b58c4e79
- Added the minEnclosingTriangle function declaration to the imgproc header
...
- Added the source code for the function in the separate file min_enclosing_triangle.cpp
2013-09-11 18:07:19 +01:00
Ozan Tonkal
620d92824c
hide VizMap and VizPair from public interface
2013-09-11 13:23:57 +02:00
Roman Donchenko
caf9fdbdc3
Merge pull request #1432 from SpecLad:unseq
2013-09-11 13:50:36 +04:00
Roman Donchenko
6fcd9e3830
Merge pull request #1431 from asmorkalov:android_recording_hint
2013-09-11 13:50:03 +04:00
Vladislav Vinogradov
6bbac2a7d9
Merge branch 'master' into gpu-cuda-rename
2013-09-11 09:41:23 +04:00
Jin Ma
b9d7e67589
Removed whitespace.
2013-09-11 11:28:36 +08:00
Jin Ma
2e0f613c38
Added performance for Kalman Filter.
2013-09-11 10:19:02 +08:00
Roman Donchenko
6a21eca7e7
Merge pull request #1421 from ilya-lavrenov:ocl_bilateral
2013-09-10 18:59:41 +04:00
Roman Donchenko
acc2ca484c
Merge pull request #1425 from pengx17:master_retina_ocl_fix
2013-09-10 18:29:25 +04:00
Roman Donchenko
242e4254f3
Merge pull request #1427 from SpecLad:merge-2.4
2013-09-10 18:28:20 +04:00
Alexander Smorkalov
98cb1dcc9a
MediaRecorder hint enabled for all Android devices with API level 14 and above.
...
It increases performance on some devices like Nexus4.
Target Android SDK version increased up to 14.
2013-09-10 18:05:45 +04:00
Roman Donchenko
51ed1873de
Eliminated unsequenced assignments to temp3 from dpstereo.cpp.
...
They're unsequenced if CV_IMIN3 or CV_IMAX3 are invoked more than once
in a single expression.
2013-09-10 18:05:23 +04:00
Ilya Lavrenov
6b9c451938
added CV_16UC(1, 3, 4), CV_16SC(1, 3, 4) data types support in ocl::pyrUp and ocl::pyrDown
2013-09-10 17:36:18 +04:00
Roman Donchenko
7238479813
Merge pull request #1415 from znah:sfm_py
2013-09-10 11:37:05 +04:00
Roman Donchenko
747f7178ca
Merge pull request #1417 from ilya-lavrenov:merge_fix
2013-09-10 11:33:25 +04:00
Roman Donchenko
68901ab471
Merge pull request #1420 from ilya-lavrenov:ocl_perf_hog
2013-09-10 11:32:35 +04:00
Roman Donchenko
95c2e8b51f
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
.gitignore
doc/tutorials/objdetect/cascade_classifier/cascade_classifier.rst
modules/gpu/src/match_template.cpp
modules/imgproc/include/opencv2/imgproc/imgproc.hpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/perf/perf_precomp.hpp
2013-09-10 11:30:19 +04:00
Roman Donchenko
260b283fb3
Merge pull request #1413 from melody-rain:2.4_kalman_filter
2013-09-10 11:28:22 +04:00
peng xiao
8767c47463
Fix whitespaces.
2013-09-10 15:13:53 +08:00
pengxiao
a92721b569
Fix retina ocl on NV.
...
Previously we incorrectly assumed data was aligned in 16 bytes, which should be 32.
2013-09-10 14:33:23 +08:00
Alex Leontiev
a29863ee7b
Eliminate use of 32-bit floating pt type
...
Replace all "float" by "double" (64-bit) to avoid "lose precision"
warnings.
2013-09-10 13:53:26 +08:00
Alex Leontiev
1207cd132b
Minor fixes
...
Fixed integer vs unsigned integer comparison in .cpp test source and
trailing whitespaces in source code
2013-09-10 13:53:26 +08:00
Alex Leontiev
11fa0651c6
Minor fixes
...
As the opencv's build-bot did not want to compile this revision, I had
to do some changes. In particular,
1) Removed unsigned int vs int comparisons, that were treated as errors
2) Removed unused variables and functions
3) Removed functions without previous declaration
4) Fixed whitespaces
2013-09-10 13:53:26 +08:00
Alex Leontiev
ccc71ac190
Primal-dual algorithm
...
This is an implementation of primal-dual algorithm, based on the C++
source code by Vadim Pisarevsky. It was extended to handle the denoising
based on multiple observations. It also contains documentation and
tests.
2013-09-10 13:53:26 +08:00
lluis
ad94628038
Using cv::magnitude instead of custom loop and Mat<float> instead of Mat<double> to compute gradient magnitude channel.
2013-09-09 18:37:55 +02:00
Roman Donchenko
4ee5599d4b
Merge pull request #1381 from 23pointsNorth:master
2013-09-09 19:53:56 +04:00
Roman Donchenko
41b8479d03
Merge pull request #1376 from StevenPuttemans:bugfix_3186
2013-09-09 18:33:11 +04:00
Ilya Lavrenov
16357418d5
increased time limit for bilateral filter performance tests
2013-09-09 18:16:53 +04:00
Roman Donchenko
d5aaab745f
Merge pull request #1282 from nailbiter:optimDS
2013-09-09 18:10:13 +04:00
Nghia Ho
0e06465a23
Merge remote-tracking branch 'upstream/master'
2013-09-09 23:23:12 +10:00
Ilya Lavrenov
b07b9aca5a
fixed HOG perf test
2013-09-09 17:16:47 +04:00
Roman Donchenko
531471b0aa
Merge pull request #1412 from jet47:gpu-match-template-nocuda
2013-09-09 16:49:33 +04:00
Roman Donchenko
84435ba741
Merge pull request #1365 from bitwangyaoyao:2.4_bilateral
2013-09-09 16:46:33 +04:00
Vadim Pisarevsky
61f2107829
added IPP optimization of separable 32f filters; fixed IPP version check in DFT; fixed conditions in IPP optimization of norm functions.
2013-09-09 16:13:39 +04:00
Ilya Lavrenov
7d8bde3330
fixed ocl::merge in case of 2 and types CV_32S and CV_32F
2013-09-09 16:12:01 +04:00
Alexander Mordvintsev
79d51c3398
expose findEssentialMat, decomposeEssentialMat and recoverPose to Python
2013-09-09 14:02:05 +04:00
lluis
e8d3732aaf
added computeNMChannels helper function to compute the diferent channels to be processed independently in the N&M algorithm.
2013-09-09 11:37:58 +02:00
Jin Ma
a4ab3f4ea8
Removed whitespace.
2013-09-09 17:00:33 +08:00
Vladislav Vinogradov
1036ce807c
Merge branch 'master' into gpu-cuda-rename
...
Conflicts:
modules/core/include/opencv2/core/cuda.hpp
modules/cudaimgproc/src/gftt.cpp
modules/objdetect/include/opencv2/objdetect/erfilter.hpp
modules/objdetect/src/erfilter.cpp
modules/superres/perf/perf_superres.cpp
modules/superres/src/btv_l1_cuda.cpp
modules/superres/src/optical_flow.cpp
modules/videostab/src/global_motion.cpp
modules/videostab/src/inpainting.cpp
samples/cpp/stitching_detailed.cpp
samples/cpp/videostab.cpp
samples/gpu/stereo_multi.cpp
2013-09-09 12:57:35 +04:00
Roman Donchenko
cb0fc230f1
Merge pull request #1387 from vpisarev:ipp_imgwarp
2013-09-09 12:54:32 +04:00
Roman Donchenko
45512a93e0
Merge pull request #1396 from melody-rain:2.4_perf_bgfg_cpp
2013-09-09 12:39:12 +04:00
Roman Donchenko
77a2529eb7
Merge pull request #1408 from jet47:new-ptr-fixes
2013-09-09 12:27:27 +04:00
Jin Ma
2d5a1dacd0
Added Kalman Filter of OpenCL version.
2013-09-09 16:08:23 +08:00
Roman Donchenko
74578f56a9
Merge pull request #1403 from lluisgomez:scene_text_detection_NM_fix
2013-09-09 12:05:57 +04:00
Roman Donchenko
a03c6decaf
Merge pull request #1409 from SpecLad:imgproc-test-memerr
2013-09-09 12:03:58 +04:00
Vladislav Vinogradov
6ad72bfcb4
removed detail:: prefix int video_reader
...
it conflicts with cv::detail
2013-09-09 10:57:51 +04:00
Vladislav Vinogradov
a0771630b0
restored original behaviour or release functions for (Buffer and Texture)
2013-09-09 10:57:45 +04:00
Vladislav Vinogradov
c439702f0c
added missing gpu::matchTemplate implementation for non-CUDA build
2013-09-09 10:51:44 +04:00
Ozan Tonkal
9895093524
check if vtk 5.10.0 exists, if not require 6.0.0
2013-09-08 19:41:35 +02:00
Ozan Tonkal
56f9168ac1
support VTK 6.0.0: cmakelist.txt might need to be refactored
2013-09-08 19:07:15 +02:00
Ozan Tonkal
26005a19bd
add license headers
2013-09-08 19:05:24 +02:00
Ozan Tonkal
c773061457
updated documentation
2013-09-08 19:03:55 +02:00
Ozan Tonkal
3bdb55e1ef
another constructor for CameraPositionWidget for displaying image by also using field of view instead of intrinsic matrix
2013-09-08 19:03:55 +02:00
Ozan Tonkal
2170559bed
text3dwidget offers now users to decide whether it should face the camera or not
2013-09-08 19:03:54 +02:00
Ozan Tonkal
286f81f305
fix crucial bug in get method, hide add and remove methods from user
2013-09-08 19:03:54 +02:00
Ozan Tonkal
fcf437cf69
combine representation methods to one as setRepresentation
2013-09-08 19:03:54 +02:00
Ozan Tonkal
94ca5d65d0
remove VIZ prefix from rendering properties, fix setRenderingProperties and getRenderingProperties methods
2013-09-08 19:03:54 +02:00
Ozan Tonkal
fdbf20c172
delete common.h, viz_types.hpp, rendering properties are public, setcolor in creating_widgets tutorial
2013-09-08 19:03:54 +02:00
Jin Ma
2fb0d23104
Removed unnecessary process for conversion to 4-channel format.
2013-09-07 10:40:30 +08:00
lluis
cd33ca0009
changed default parameters in CreateERFiltersNM{1,2} functions. They are not needed now in the sample example.
2013-09-06 19:10:53 +02:00
Anatoly Baksheev
9a91a12fb2
VIZ disabled by default, VTK search is performed iff BUILD_opencv_viz is enabled
2013-09-06 19:50:47 +04:00
Anatoly Baksheev
477ca067f0
compilation for macos
2013-09-06 19:32:35 +04:00
Anatoly Baksheev
eed7bf6902
compilation for windows
2013-09-06 18:43:14 +04:00
Fedor Morozov
a7bcf63765
Robertson docs
2013-09-06 18:21:59 +04:00
Fedor Morozov
c118f3c529
Robertson update
2013-09-06 17:30:43 +04:00
Roman Donchenko
ff1eb0d582
Merge pull request #1407 from ilya-lavrenov:ocl_test_mog
2013-09-06 16:58:21 +04:00
Roman Donchenko
4f109d1292
Fixed a memory access error in CV_Remap_Test::generate_test_data.
...
begin_x[1] is not the second component of the element, but the element
after the one pointed to begin_x. When begin_x points to the last
element, that line overwrites data past the end of the allocation, which,
during my tests, happened to contain the reference count for the matrix.
Hilarity ensues.
2013-09-06 16:02:41 +04:00
lluis
6ef1d456dd
fixed rebase conflicts
2013-09-06 14:00:11 +02:00
Roman Donchenko
2de8487e58
Fixed a few tests that use uninitialized inputs.
2013-09-06 15:53:42 +04:00
Vladislav Vinogradov
b7eff94137
fixed compilation issues with new Ptr
2013-09-06 15:52:07 +04:00
Vladislav Vinogradov
0c7663eb3b
Merge branch 'master' into gpu-cuda-rename
...
Conflicts:
modules/core/include/opencv2/core/cuda.hpp
modules/cudacodec/src/thread.cpp
modules/cudacodec/src/thread.hpp
modules/superres/perf/perf_superres.cpp
modules/superres/src/btv_l1_cuda.cpp
modules/superres/src/optical_flow.cpp
modules/videostab/src/global_motion.cpp
modules/videostab/src/inpainting.cpp
samples/cpp/stitching_detailed.cpp
samples/cpp/videostab.cpp
samples/gpu/stereo_multi.cpp
2013-09-06 15:44:44 +04:00
Fedor Morozov
deeaddb0a9
Doc update
2013-09-06 14:49:19 +04:00
Fedor Morozov
f4792f8a44
Doc update
2013-09-06 14:43:04 +04:00
lluis
512111af9c
removed blank line at EOF
2013-09-06 12:32:10 +02:00
lluis
1cc6502db3
removed unnecessary commented block
2013-09-06 12:32:10 +02:00
lluis
04913f5af7
removed trailing whitespaces
2013-09-06 12:32:10 +02:00
lluis
f4d01175b8
fixed a bug in the calculation of the number of inflexion points feature
2013-09-06 12:31:49 +02:00
lluis
765921cc25
fixed a typo error in the default min_Probability param of CreateERFilterNM2
2013-09-06 12:30:22 +02:00
lluis
dba336c0e3
fixed a bug in the non-max-suppression filter procedure
2013-09-06 12:27:19 +02:00
ilya-lavrenov
27947474ec
fixed data path
2013-09-06 13:25:56 +04:00
Roman Donchenko
7d62fdc62c
GPU resize: removed a few parameter names to avoid unused parameter warnings.
2013-09-06 12:46:58 +04:00
Roman Donchenko
439e90f4f4
retina_ocl.cpp: removed two unused arrays.
2013-09-06 12:34:37 +04:00
Roman Donchenko
af594c8e44
retina_ocl.hpp: switched BasicRetinaFilter's members around to fix a -Wreorder warning.
2013-09-06 12:33:54 +04:00
hbristow
74accbd969
Added <algorithm> to mxarray.hpp, which seems to be needed explictly by some compilers
2013-09-06 16:42:32 +10:00
Jin Ma
172242a94e
Revised performance test according to the feedback of the community.
2013-09-06 13:39:41 +08:00
hbristow
6964f6aacc
Removed unused Dynamic from matlab namespace - clashing with Eigen
2013-09-06 15:26:05 +10:00
Ozan Tonkal
5eed0d6bef
remove common.h include from widgets.hpp
2013-09-05 21:03:40 +02:00
Ozan Tonkal
31501ebf4f
replace tabs by spaces
2013-09-05 21:03:39 +02:00
Ozan Tonkal
a5b75769a3
initial documentation
2013-09-05 21:03:39 +02:00
Ozan Tonkal
2822845ba6
set get RenderingProperty id comes first
2013-09-05 21:03:39 +02:00
Ozan Tonkal
9d4fe6984b
remove setWindowName method to avoid complications
2013-09-05 21:03:39 +02:00
Ozan Tonkal
21be9796ae
comments on widgets where constructors might be confusing
2013-09-05 21:03:39 +02:00
ozantonkal
2705113bc4
remove common.cpp, remove commented code in common.h
2013-09-05 21:03:39 +02:00
ozantonkal
ffbb5e9524
resetCamera, resetViewpoint in Viz3d
2013-09-05 21:03:39 +02:00
ozantonkal
4aa61dee50
minor refactoring interactor_style
2013-09-05 21:03:39 +02:00
ozantonkal
af8a918e04
fix minor bug, minor cleaning, cv_assert with messages
2013-09-05 21:03:39 +02:00
ozantonkal
69f135ec57
fix memory leak in viz3d
2013-09-05 21:03:39 +02:00
ozantonkal
6c0c217562
removed reference counter in widgets, fixed memory leak
2013-09-05 21:03:39 +02:00
ozantonkal
4b443059ec
reverted widget reference count in order to avoid memory leak
2013-09-05 21:03:39 +02:00
ozantonkal
8007e07ad2
load mesh function is finalized: color range is always 0-255 and RGB due to vtkPLYReader limitations
2013-09-05 21:03:39 +02:00
ozantonkal
e4b13f2ef0
update reader after setting file name
2013-09-05 21:03:39 +02:00
ozantonkal
3da7dd9849
fix yellow and magenta color bgr codes
2013-09-05 21:03:39 +02:00
ozantonkal
9086cf5d79
remove unused includes and libraries from linking
2013-09-05 21:03:39 +02:00
ozantonkal
3038ffb886
setDesiredUpdateRate implementation in Viz3d
2013-09-05 20:56:33 +02:00
ozantonkal
ed0162ad0b
remove reference counting in widgets
2013-09-05 20:56:33 +02:00
ozantonkal
08917908f3
remove eigen dependency
2013-09-05 20:56:33 +02:00
ozantonkal
f98614ece0
remove cloudactormap, shapeactormap. only vtkProp is stored and view transformation can be obtained using GetUserMatrix of vtkProp3D
2013-09-05 20:56:33 +02:00
ozantonkal
f6e1a093cd
implement window relevant methods in Viz3d
2013-09-05 20:56:33 +02:00
ozantonkal
4f416352e1
implemented actor representation methods in viz3d
2013-09-05 20:56:33 +02:00
ozantonkal
cf36b8f817
rendering properties in Widget and Viz3d
2013-09-05 20:56:33 +02:00
ozantonkal
b032b4dded
move frompolyfile to widget class as static method, remove addpolygon and its alikes
2013-09-05 20:56:33 +02:00
ozantonkal
0bbaf5d47a
removeAllWidgets implementation, removed other remove methods
2013-09-05 20:56:33 +02:00
ozantonkal
e106dcc606
remove include vtk headers from outside of precomp.hpp
2013-09-05 20:56:32 +02:00
Ilya Lavrenov
be98cd2f7f
replaced explicit __stdcall by CV_STDCALL
2013-09-05 19:25:03 +04:00
Roman Donchenko
86b841563b
Added tests for Ptr.
2013-09-05 19:03:00 +04:00
Roman Donchenko
c7d2fdc4b2
Fixed some dubious uses of tbb::task_scheduler_init.
2013-09-05 19:03:00 +04:00
Roman Donchenko
a97ffe6513
Rewrote the documentation for Ptr to fit the new implementation.
2013-09-05 19:03:00 +04:00
Roman Donchenko
a50d75d362
Made Filestorage able to not own its CvFileStorage instance.
...
This allows to get rid of the last remaining Ptr<T>::addref calls.
2013-09-05 19:03:00 +04:00
Roman Donchenko
3e189a2b41
Replaced calls to Ptr<T>::ptr to ::dynamicCast.
2013-09-05 19:03:00 +04:00
Roman Donchenko
24dee16b12
Added to CV_INIT_ALGORITHM a Ptr creation function, for convenience.
...
Also changed the static functions to inline, to stop GCC complaining
about unused functions.
2013-09-05 19:03:00 +04:00
Roman Donchenko
dadee3752c
Adapt Python bindings to the new Ptr.
2013-09-05 19:03:00 +04:00
Roman Donchenko
2f942efdf7
Java: removed usages of Ptr<T>::addref().
...
Now the features2d class wrappers use composition instead of inheritance.
2013-09-05 19:03:00 +04:00
Roman Donchenko
eaa7fcc3e6
Boring changes - legacy.
2013-09-05 19:02:59 +04:00
Roman Donchenko
34127ba80f
Boring changes - contrib.
2013-09-05 19:02:59 +04:00
Roman Donchenko
3bca57ac25
Boring changes - ocl.
2013-09-05 19:02:59 +04:00
Roman Donchenko
fc0e835762
Boring changes - gpuwarping.
2013-09-05 19:02:59 +04:00
Roman Donchenko
d33ff4bb11
Boring changes - gpustereo.
2013-09-05 19:02:59 +04:00
Roman Donchenko
d6146e9543
Boring changes - gpulegacy.
2013-09-05 19:02:59 +04:00
Roman Donchenko
a007c7b980
Boring changes - gpuimgproc.
2013-09-05 19:02:58 +04:00
Roman Donchenko
b165016ba7
Boring changes - gpufilters.
2013-09-05 19:02:58 +04:00
Roman Donchenko
a57f93ee92
Boring changes - gpucodec.
2013-09-05 19:02:58 +04:00
Roman Donchenko
2c033251db
Boring changes - gpubgsegm.
2013-09-05 19:02:58 +04:00
Roman Donchenko
f8f0685397
Boring changes - gpuarithm.
2013-09-05 19:02:58 +04:00
Roman Donchenko
57595a8308
Boring changes - gpu.
2013-09-05 19:02:58 +04:00
Roman Donchenko
0dcb4f1f66
Boring changes - videostab.
2013-09-05 19:02:58 +04:00
Roman Donchenko
808e0cf10b
Boring changes - video.
2013-09-05 19:02:58 +04:00
Roman Donchenko
93f757f8a2
Boring changes - superres.
2013-09-05 19:02:58 +04:00
Roman Donchenko
f21851f0f4
Boring changes - stitching.
2013-09-05 19:02:58 +04:00
Roman Donchenko
cce0f48d3e
Boring changes - softcascade.
2013-09-05 19:02:58 +04:00
Roman Donchenko
32205d3c5b
Boring changes - photo.
2013-09-05 19:02:58 +04:00
Roman Donchenko
b12894d95a
Boring changes - objdetect.
2013-09-05 19:02:58 +04:00
Roman Donchenko
de6a934f66
Boring changes - nonfree.
2013-09-05 18:26:44 +04:00
Roman Donchenko
345bc633cc
Boring changes - ml.
2013-09-05 18:26:44 +04:00
Roman Donchenko
1eacb485c5
Boring changes - features2d.
2013-09-05 18:26:44 +04:00
Roman Donchenko
bd70a033fc
Boring changes - calib3d.
2013-09-05 18:26:43 +04:00
Roman Donchenko
711fb6bd92
Boring changes - bioinspired.
2013-09-05 18:26:43 +04:00
Roman Donchenko
beeb932d22
Boring changes - highgui.
2013-09-05 18:26:43 +04:00
Roman Donchenko
254d4ae429
Boring changes - imgproc.
2013-09-05 18:26:43 +04:00
Roman Donchenko
8200a95ced
Boring changes - core.
...
This and several following commits contain the "boring" changes required
to support the new Ptr. These are changes like:
* new T -> makePtr<T> or .reset(new T) or Ptr<T>(new T)
(depending on the situation)
* p.empty() -> !p
* delete_obj -> DefaultDeleter::operator()
and similar changes that are numerous, but primitive.
2013-09-05 18:26:43 +04:00
Jin Ma
1366df8250
MOG&MOG2: Modified the performance test according to the feedback of the community.
2013-09-05 19:33:27 +08:00
Roman Donchenko
461c98fa86
Replaced Ptr with my new implementation.
2013-09-05 14:54:20 +04:00
Fedor Morozov
e33a4f79f8
Merge branch 'devel' of https://github.com/f-morozov/opencv into devel
2013-09-05 14:49:18 +04:00
Fedor Morozov
85eb52b8af
Debevec Calibrate
2013-09-05 14:41:35 +04:00
fm
cb27740de4
Linux compilation
2013-09-05 14:26:21 +04:00
Fedor Morozov
0f703b8162
Calibrate Debevec changes
2013-09-05 14:10:53 +04:00
Roman Donchenko
70711ac6c2
Merge pull request #1400 from ilya-lavrenov:ocl_test_mog
2013-09-05 11:58:52 +04:00
Roman Donchenko
ecc51817d9
Merge pull request #1399 from pengx17:master_retina_ocl_fix
2013-09-05 11:57:46 +04:00
Roman Donchenko
b9ae8623b2
Merge pull request #1398 from ilya-lavrenov:ocl_perf_gemm
2013-09-05 11:56:24 +04:00
Daniel Angelov
25c0d5978c
Update on the compare lines method.
2013-09-05 00:02:24 +03:00
ilya-lavrenov
722bdc52a0
enabled gemm and dft erf test
2013-09-04 20:02:02 +04:00
ilya-lavrenov
0f8f489658
changed data path and eps
2013-09-04 18:46:46 +04:00
Roman Donchenko
6ebfa87181
Delete a bunch more trailing whitespace that slipped through the cracks.
2013-09-04 16:13:27 +04:00
Daniel Angelov
b5e1eb7d48
Removed IOArray constness.
2013-09-04 14:59:57 +03:00
Roman Donchenko
33d8d8ffd1
Merge pull request #1392 from SpecLad:flann-uninit
2013-09-04 15:49:14 +04:00
Nghia Ho
cc15898353
Merged with HEAD and removed C interface to rotatedRectangleIntersection
2013-09-04 20:45:10 +10:00
Roman Donchenko
a9975b144a
Fixed a bug in FLANN resulting in uninitialized accesses.
...
This is fixed upstream in mariusmuja/flann@b615f26 , but that fix
would break binary compatibility, so I had to make a different one.
Since the bug isn't quite obvious, here's an explanation. In the const
version of any::cast, if policy is a small_any_policy, its get_value
returns its input argument. So r becomes a pointer to obj, and the
return value is a reference to a local variable, which is invalidated
when the function exits.
2013-09-04 14:06:34 +04:00
pengxiao
e45f92a9e1
Fix a bug of ocl retina on NVIDIA platform.
2013-09-04 16:38:36 +08:00
Roman Donchenko
fd3b2326b4
Merge pull request #1373 from abidrahmank:pykeypoints
2013-09-04 11:53:33 +04:00
Vladislav Vinogradov
f46b7fcf86
fixed warnings in resize.cu
2013-09-04 11:15:18 +04:00
Jin Ma
dd73016c8b
Removed whitespace.
2013-09-04 15:00:36 +08:00
Jin Ma
e528f39def
Added the performance test for mog and mog2.
2013-09-04 14:37:46 +08:00
Vladislav Vinogradov
1ad4592bfc
Merge branch 'master' into gpu-cuda-rename
...
Conflicts:
modules/cudaoptflow/perf/perf_optflow.cpp
modules/cudaoptflow/src/tvl1flow.cpp
samples/gpu/stereo_multi.cpp
2013-09-04 09:58:32 +04:00
Roman Donchenko
009919872f
Merge pull request #1389 from SpecLad:merge-2.4
2013-09-03 19:42:06 +04:00
Abid K
0902f183ca
alignment of parameters as per speclad
2013-09-03 21:12:03 +05:30
Roman Donchenko
79457f8f49
Merge pull request #1224 from mbarnach:pca_io
2013-09-03 18:43:54 +04:00
Roman Donchenko
c42d61e464
Merge pull request #1283 from melody-rain:new_mog_mog2
2013-09-03 18:43:03 +04:00
Roman Donchenko
b3e73cf7d6
Merge pull request #1388 from bitwangyaoyao:2.4_CLAHE
2013-09-03 18:30:15 +04:00
Alexander Shishkov
e354fa3fd1
fixed test data in highgui test for HDR
2013-09-03 14:24:14 +04:00
Alexander Shishkov
924f7ce373
small changes for compilation
2013-09-03 14:05:14 +04:00
Roman Donchenko
e7f83619c5
Merge pull request #1378 from StevenPuttemans:bugfix_3115
2013-09-03 12:07:24 +04:00
Roman Donchenko
f50a829943
Merge pull request #1383 from pengx17:2.4_clblas
2013-09-03 12:05:01 +04:00
yao
a70bdfc13f
a little fix to tests and sample
2013-09-03 15:02:18 +08:00
pengxiao
ea16539448
Fix a crash of ocl program if clAmdBlas is not linked.
2013-09-03 10:30:37 +08:00
peng xiao
7b3e3f69fb
Modify according to @alalek.
2013-09-03 09:31:13 +08:00
hbristow
7e5bbec895
Removing trailing whitespace and expanded tabs
2013-09-03 10:14:45 +10:00
Anatoly Baksheev
35e7952909
simplify modules/viz/CMakeLists.txt
2013-09-03 01:59:00 +04:00
Roman Donchenko
18bb951574
Nuked the rest of the precomp.cpp files.
...
Consider this a part of merging #1357 .
2013-09-02 19:53:45 +04:00
Roman Donchenko
9218f4976c
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/contrib/src/retina.cpp
modules/gpu/perf/perf_video.cpp
modules/gpuoptflow/src/tvl1flow.cpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/perf/perf_calib3d.cpp
modules/ocl/perf/perf_color.cpp
modules/ocl/perf/perf_match_template.cpp
modules/ocl/src/precomp.hpp
samples/gpu/stereo_multi.cpp
2013-09-02 19:44:51 +04:00
Vadim Pisarevsky
e85e4d3ab9
fixed bug in IPP-accelerated morphology; added several IPP imgwarp functions (by Klim)
2013-09-02 18:34:50 +04:00
kdrobnyh
e6ec3dd17f
Add IPP support in resize, warpAffine, warpPerspective functions
2013-09-02 18:04:06 +04:00
Roman Donchenko
757e7f842b
Merge pull request #1300 from kdrobnyh:FilterBilateral
2013-09-02 17:01:38 +04:00
Roman Donchenko
99043f6fc2
Merge pull request #1385 from asmorkalov:winrt_glob_fix
2013-09-02 16:05:15 +04:00
Fedor Morozov
e15eabe3fa
Ghostbusters
2013-09-02 16:03:10 +04:00
Alexander Smorkalov
6d3102141c
Globbing accuracy test fail on Windows RT fixed.
2013-09-02 04:31:58 -07:00
Roman Donchenko
188d3f02ee
Merge pull request #1302 from kdrobnyh:compare
2013-09-02 15:11:20 +04:00
Vladislav Vinogradov
ba4bf04c6c
fixed incorrect GPUs -> CUDAs replacement
2013-09-02 14:00:44 +04:00
Vladislav Vinogradov
a41006754e
fix documentation
2013-09-02 14:00:44 +04:00
Vladislav Vinogradov
429bfad225
removed precomp.cpp files
2013-09-02 14:00:44 +04:00
Vladislav Vinogradov
cbe437571e
fixed docs
2013-09-02 14:00:44 +04:00
Vladislav Vinogradov
f936c1283b
fixed sanity test for cuda module
2013-09-02 14:00:44 +04:00
Vladislav Vinogradov
fd88654b45
replaced GPU -> CUDA
2013-09-02 14:00:44 +04:00
Vladislav Vinogradov
3c34b24f1f
replaced gpu->cuda in files names
2013-09-02 14:00:44 +04:00
Vladislav Vinogradov
ae94256edc
renmaed gpu module -> cuda
2013-09-02 14:00:44 +04:00
Vladislav Vinogradov
29386f1449
renamed gpubgsegm -> cudabgsegm
2013-09-02 14:00:43 +04:00