Ozan Tonkal [Wed, 18 Sep 2013 07:44:37 +0000 (08:44 +0100)]
Merge remote-tracking branch 'itseez/master'
Alexander Smorkalov [Wed, 18 Sep 2013 06:39:52 +0000 (10:39 +0400)]
Merge pull request #1465 from jet47:cudev-old-cc
Alexander Smorkalov [Tue, 17 Sep 2013 18:50:48 +0000 (22:50 +0400)]
Merge pull request #1458 from look4pritam:my-branch
Ozan Tonkal [Tue, 17 Sep 2013 18:17:13 +0000 (20:17 +0200)]
include viz tutorials in the main tutorials file. ignore viz samples
Ozan Tonkal [Tue, 17 Sep 2013 16:55:10 +0000 (18:55 +0200)]
ignore viz tutorials when BUILD_opencv_viz is not set
Ozan Tonkal [Tue, 17 Sep 2013 15:50:14 +0000 (17:50 +0200)]
Merge remote-tracking branch 'itseezstream/master'
Andrey Pavlenko [Tue, 17 Sep 2013 13:50:46 +0000 (17:50 +0400)]
Merge pull request #1446 from lluisgomez:scene_text_detection_NM_fix2
Vladislav Vinogradov [Tue, 17 Sep 2013 13:43:12 +0000 (17:43 +0400)]
fixed cudev compilation for old pre-Fermi archs
look4pritam [Mon, 16 Sep 2013 08:09:11 +0000 (13:39 +0530)]
The thin prism distortion coefficient related small bug is fixed.
Ozan Tonkal [Sun, 15 Sep 2013 14:32:56 +0000 (16:32 +0200)]
merge with Itseez/opencv
Ozan Tonkal [Sun, 15 Sep 2013 14:26:53 +0000 (16:26 +0200)]
rename widgets from *Widgets to W*
Ozan Tonkal [Sun, 15 Sep 2013 09:24:20 +0000 (11:24 +0200)]
cmake check if VTK version is lower than 5, and give fatal error if it is
lluis [Fri, 13 Sep 2013 14:29:21 +0000 (16:29 +0200)]
first parameter of createERFilterNM1/createERFilterNM2 is now mandatory. changed the sample program to use the new prototypes
lluis [Fri, 13 Sep 2013 14:19:52 +0000 (16:19 +0200)]
renamed getDefaultClassifierNM{1,2}() to loadClassifierNM{1,2}() and added "const std::string& filename" parameter (mandatory).
Roman Donchenko [Fri, 13 Sep 2013 11:01:14 +0000 (15:01 +0400)]
Merge pull request #1445 from vpisarev:stereocalib_quick_fix
lluis [Fri, 13 Sep 2013 10:54:23 +0000 (12:54 +0200)]
functions getDefaultClassifierNM1() and getDefaultClassifierNM2() allow to implicitly load the default classifiers when creating a ERFilter object
Roman Donchenko [Fri, 13 Sep 2013 10:31:01 +0000 (14:31 +0400)]
Merge pull request #1330 from lenlen:plantuml
Vadim Pisarevsky [Fri, 13 Sep 2013 09:32:42 +0000 (13:32 +0400)]
fix thin-prism coefficients at 0's in the stereo calibration function unless the flag CALIB_THIN_PRISM_MODEL is explicitly set
Roman Donchenko [Fri, 13 Sep 2013 09:31:14 +0000 (13:31 +0400)]
Merge pull request #1414 from lluisgomez:scene_text_detection_computeNMChannels
Roman Donchenko [Fri, 13 Sep 2013 09:27:01 +0000 (13:27 +0400)]
Merge pull request #1426 from nailbiter:optimPD
Roman Donchenko [Fri, 13 Sep 2013 09:17:05 +0000 (13:17 +0400)]
Merge pull request #1441 from look4pritam:prism-stereo
Roman Donchenko [Fri, 13 Sep 2013 09:16:30 +0000 (13:16 +0400)]
Merge pull request #1442 from SpecLad:version-status
Ozan Tonkal [Thu, 12 Sep 2013 17:23:05 +0000 (19:23 +0200)]
re-render the scene after changing camera properties
Roman Donchenko [Thu, 12 Sep 2013 12:40:14 +0000 (16:40 +0400)]
Bumped version to 3.0.
Roman Donchenko [Thu, 12 Sep 2013 12:39:14 +0000 (16:39 +0400)]
Updated the Java bindings and docs to support the version status.
Roman Donchenko [Thu, 12 Sep 2013 12:37:30 +0000 (16:37 +0400)]
Updated the build config files to deal with the version status.
I didn't make the status part of the version variables here, because
letters don't play too well with version comparison algorithms
(especially with CMake's, which only supports numbers).
Roman Donchenko [Thu, 12 Sep 2013 12:37:05 +0000 (16:37 +0400)]
Added version status support into the build system.
Roman Donchenko [Thu, 12 Sep 2013 12:20:09 +0000 (16:20 +0400)]
Added an additional version component - the development status.
This will allow us to distinguish between regular releases, prereleases
and development versions.
antonella [Wed, 4 Sep 2013 14:00:50 +0000 (16:00 +0200)]
Added plantuml extension
Aligned strings in CMakeList
Modified the check on plantuml extension
Some fixes
Moved find_host_program for plantuml script
look4pritam [Thu, 12 Sep 2013 09:47:11 +0000 (15:17 +0530)]
The prism distortion coefficients are added for the stereo calibration.
Roman Donchenko [Wed, 11 Sep 2013 15:06:50 +0000 (19:06 +0400)]
Merge pull request #1436 from SpecLad:host-git
Roman Donchenko [Wed, 11 Sep 2013 13:54:34 +0000 (17:54 +0400)]
Fixed finding Git when cross-compiling.
Ozan Tonkal [Wed, 11 Sep 2013 11:23:57 +0000 (13:23 +0200)]
hide VizMap and VizPair from public interface
Roman Donchenko [Tue, 10 Sep 2013 14:29:24 +0000 (18:29 +0400)]
Merge pull request #1425 from pengx17:master_retina_ocl_fix
Roman Donchenko [Tue, 10 Sep 2013 14:28:19 +0000 (18:28 +0400)]
Merge pull request #1427 from SpecLad:merge-2.4
Roman Donchenko [Tue, 10 Sep 2013 07:37:04 +0000 (11:37 +0400)]
Merge pull request #1415 from znah:sfm_py
Roman Donchenko [Tue, 10 Sep 2013 07:32:09 +0000 (11:32 +0400)]
Merge pull request #1422 from SpecLad:nat-act-upd
Roman Donchenko [Tue, 10 Sep 2013 07:30:19 +0000 (11:30 +0400)]
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
peng xiao [Tue, 10 Sep 2013 07:13:53 +0000 (15:13 +0800)]
Fix whitespaces.
pengxiao [Tue, 10 Sep 2013 06:33:23 +0000 (14:33 +0800)]
Fix retina ocl on NV.
Previously we incorrectly assumed data was aligned in 16 bytes, which should be 32.
Alex Leontiev [Sun, 1 Sep 2013 05:59:15 +0000 (13:59 +0800)]
Eliminate use of 32-bit floating pt type
Replace all "float" by "double" (64-bit) to avoid "lose precision"
warnings.
Alex Leontiev [Sat, 31 Aug 2013 23:11:31 +0000 (07:11 +0800)]
Minor fixes
Fixed integer vs unsigned integer comparison in .cpp test source and
trailing whitespaces in source code
Alex Leontiev [Sat, 31 Aug 2013 17:02:06 +0000 (01:02 +0800)]
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
Alex Leontiev [Mon, 19 Aug 2013 09:19:52 +0000 (17:19 +0800)]
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.
lluis [Mon, 9 Sep 2013 16:37:55 +0000 (18:37 +0200)]
Using cv::magnitude instead of custom loop and Mat<float> instead of Mat<double> to compute gradient magnitude channel.
Roman Donchenko [Mon, 9 Sep 2013 15:53:55 +0000 (19:53 +0400)]
Merge pull request #1381 from 23pointsNorth:master
Roman Donchenko [Mon, 9 Sep 2013 14:17:02 +0000 (18:17 +0400)]
Updated the native activity sample to master's API.
Roman Donchenko [Mon, 9 Sep 2013 14:16:20 +0000 (18:16 +0400)]
Reenabled adding native app glue for Android samples.
Roman Donchenko [Mon, 9 Sep 2013 14:10:12 +0000 (18:10 +0400)]
Merge pull request #1282 from nailbiter:optimDS
Roman Donchenko [Mon, 9 Sep 2013 12:49:33 +0000 (16:49 +0400)]
Merge pull request #1412 from jet47:gpu-match-template-nocuda
Roman Donchenko [Mon, 9 Sep 2013 12:46:32 +0000 (16:46 +0400)]
Merge pull request #1365 from bitwangyaoyao:2.4_bilateral
Roman Donchenko [Mon, 9 Sep 2013 11:03:40 +0000 (15:03 +0400)]
Merge pull request #1410 from SpecLad:module-samples
Roman Donchenko [Mon, 9 Sep 2013 11:03:07 +0000 (15:03 +0400)]
Merge pull request #1416 from asmorkalov:doc_hough_circle
Alexander Mordvintsev [Mon, 9 Sep 2013 09:55:35 +0000 (13:55 +0400)]
expose findEssentialMat, decomposeEssentialMat and recoverPose to Python
Alexander Smorkalov [Mon, 9 Sep 2013 09:53:49 +0000 (13:53 +0400)]
Link to Hough Circle Transform sample fixed in tutorial.
lluis [Mon, 9 Sep 2013 09:37:58 +0000 (11:37 +0200)]
added computeNMChannels helper function to compute the diferent channels to be processed independently in the N&M algorithm.
Roman Donchenko [Mon, 9 Sep 2013 08:54:32 +0000 (12:54 +0400)]
Merge pull request #1387 from vpisarev:ipp_imgwarp
Roman Donchenko [Mon, 9 Sep 2013 08:39:12 +0000 (12:39 +0400)]
Merge pull request #1396 from melody-rain:2.4_perf_bgfg_cpp
Roman Donchenko [Mon, 9 Sep 2013 08:27:26 +0000 (12:27 +0400)]
Merge pull request #1408 from jet47:new-ptr-fixes
Roman Donchenko [Mon, 9 Sep 2013 08:05:56 +0000 (12:05 +0400)]
Merge pull request #1403 from lluisgomez:scene_text_detection_NM_fix
Roman Donchenko [Mon, 9 Sep 2013 08:03:58 +0000 (12:03 +0400)]
Merge pull request #1409 from SpecLad:imgproc-test-memerr
Vladislav Vinogradov [Fri, 6 Sep 2013 12:48:13 +0000 (16:48 +0400)]
removed detail:: prefix int video_reader
it conflicts with cv::detail
Vladislav Vinogradov [Mon, 9 Sep 2013 06:57:45 +0000 (10:57 +0400)]
restored original behaviour or release functions for (Buffer and Texture)
Vladislav Vinogradov [Mon, 9 Sep 2013 06:51:44 +0000 (10:51 +0400)]
added missing gpu::matchTemplate implementation for non-CUDA build
Ozan Tonkal [Sun, 8 Sep 2013 17:29:59 +0000 (19:29 +0200)]
check if vtk 5.10.0 exists, if not require 6.0.0
Ozan Tonkal [Sun, 8 Sep 2013 16:55:41 +0000 (18:55 +0200)]
support VTK 6.0.0: cmakelist.txt might need to be refactored
Ozan Tonkal [Sun, 8 Sep 2013 13:20:02 +0000 (15:20 +0200)]
add license headers
Ozan Tonkal [Sun, 8 Sep 2013 12:26:58 +0000 (14:26 +0200)]
updated documentation
Ozan Tonkal [Sun, 8 Sep 2013 11:06:40 +0000 (13:06 +0200)]
another constructor for CameraPositionWidget for displaying image by also using field of view instead of intrinsic matrix
Ozan Tonkal [Sun, 8 Sep 2013 10:19:14 +0000 (12:19 +0200)]
text3dwidget offers now users to decide whether it should face the camera or not
Ozan Tonkal [Sat, 7 Sep 2013 22:15:14 +0000 (00:15 +0200)]
fix crucial bug in get method, hide add and remove methods from user
Ozan Tonkal [Sat, 7 Sep 2013 16:23:26 +0000 (18:23 +0200)]
transformations tutorial rst
Ozan Tonkal [Sat, 7 Sep 2013 15:26:57 +0000 (17:26 +0200)]
tutorial code for makeTransformToGlobal, makeCameraPose, minor fixes in widget_pose tutorial
Ozan Tonkal [Sat, 7 Sep 2013 13:44:26 +0000 (15:44 +0200)]
some of the tutorials
Ozan Tonkal [Sat, 7 Sep 2013 13:16:26 +0000 (15:16 +0200)]
combine representation methods to one as setRepresentation
Ozan Tonkal [Sat, 7 Sep 2013 12:48:46 +0000 (14:48 +0200)]
remove VIZ prefix from rendering properties, fix setRenderingProperties and getRenderingProperties methods
Ozan Tonkal [Sat, 7 Sep 2013 11:20:13 +0000 (13:20 +0200)]
delete common.h, viz_types.hpp, rendering properties are public, setcolor in creating_widgets tutorial
Jin Ma [Sat, 7 Sep 2013 02:40:30 +0000 (10:40 +0800)]
Removed unnecessary process for conversion to 4-channel format.
lluis [Fri, 6 Sep 2013 17:10:53 +0000 (19:10 +0200)]
changed default parameters in CreateERFiltersNM{1,2} functions. They are not needed now in the sample example.
Anatoly Baksheev [Fri, 6 Sep 2013 15:50:22 +0000 (19:50 +0400)]
VIZ disabled by default, VTK search is performed iff BUILD_opencv_viz is enabled
Anatoly Baksheev [Fri, 6 Sep 2013 15:32:35 +0000 (19:32 +0400)]
compilation for macos
Anatoly Baksheev [Fri, 6 Sep 2013 14:43:14 +0000 (18:43 +0400)]
compilation for windows
Anatoly Baksheev [Fri, 6 Sep 2013 14:39:23 +0000 (07:39 -0700)]
Merge pull request #20 from ozantonkal/low_order_tasks
Low order tasks
Roman Donchenko [Fri, 6 Sep 2013 12:58:21 +0000 (16:58 +0400)]
Merge pull request #1407 from ilya-lavrenov:ocl_test_mog
Roman Donchenko [Fri, 6 Sep 2013 12:55:44 +0000 (16:55 +0400)]
Merge pull request #1406 from SpecLad:gpu-resize-warn
Roman Donchenko [Fri, 6 Sep 2013 12:02:41 +0000 (16:02 +0400)]
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.
lluis [Fri, 6 Sep 2013 12:00:11 +0000 (14:00 +0200)]
fixed rebase conflicts
Roman Donchenko [Fri, 6 Sep 2013 11:53:42 +0000 (15:53 +0400)]
Fixed a few tests that use uninitialized inputs.
Vladislav Vinogradov [Fri, 6 Sep 2013 11:52:07 +0000 (15:52 +0400)]
fixed compilation issues with new Ptr
Roman Donchenko [Fri, 6 Sep 2013 11:10:05 +0000 (15:10 +0400)]
Merge pull request #1405 from SpecLad:retina-ocl-warn
lluis [Thu, 5 Sep 2013 04:11:01 +0000 (06:11 +0200)]
removed blank line at EOF
lluis [Wed, 4 Sep 2013 19:23:16 +0000 (21:23 +0200)]
removed unnecessary commented block
lluis [Wed, 4 Sep 2013 19:19:43 +0000 (21:19 +0200)]
removed trailing whitespaces
lluis [Wed, 4 Sep 2013 18:25:29 +0000 (20:25 +0200)]
better parameter settings for the ERFilter sample
lluis [Wed, 4 Sep 2013 18:23:37 +0000 (20:23 +0200)]
better classifiers performance by training them with a new dataset of "manually" selected regions
lluis [Wed, 4 Sep 2013 18:22:05 +0000 (20:22 +0200)]
fixed a bug in the calculation of the number of inflexion points feature
lluis [Wed, 4 Sep 2013 18:20:25 +0000 (20:20 +0200)]
fixed a typo error in the default min_Probability param of CreateERFilterNM2
lluis [Wed, 4 Sep 2013 18:19:13 +0000 (20:19 +0200)]
fixed a bug in the non-max-suppression filter procedure
ilya-lavrenov [Fri, 6 Sep 2013 09:25:56 +0000 (13:25 +0400)]
fixed data path
Roman Donchenko [Fri, 6 Sep 2013 08:46:58 +0000 (12:46 +0400)]
GPU resize: removed a few parameter names to avoid unused parameter warnings.