hbristow
c5ffd1fdea
Updated main Matlab help string
2013-08-07 01:10:51 +10:00
Roman Donchenko
5dd598fc6d
Fix building the iOS framework after I dropped the VERSION macro.
...
This version uses CMake to generate Info.plist, which should be more
reliable than the old approach.
2013-08-06 18:56:36 +04:00
Vadim Pisarevsky
10fde1ca5c
disabled 64f IPP DFT; added IPP Gaussian filter; added IPP GetRectSubPix; added IPP BilateralFilter (temporarily disabled)
2013-08-06 18:31:06 +04:00
hbristow
7ef3be3429
By default, all function now export at least one return value back into the Matlab workspace, even if none are requested. This is in line with Matlab's calling convention, where functions called without an lvalue or a semicolon have their first output printed to the terminal
2013-08-07 00:14:13 +10:00
Fedor Morozov
3725c1fb4c
Documentation updates
2013-08-06 18:13:34 +04:00
Roman Donchenko
48a6edbdfe
Fixed compilation errors.
2013-08-06 18:07:08 +04:00
Roman Donchenko
8bed7bb5f9
Fixed documentation errors.
2013-08-06 18:07:08 +04:00
Roman Donchenko
2f780ed994
Fix whitespace errors.
2013-08-06 18:07:00 +04:00
Roman Donchenko
131458847b
Make ts always static.
...
This allows us to forget about the GTEST_(CREATE|LINKED_AS)_SHARED_LIBRARY
macros and to get rid of the dependency on cvconfig.h.
2013-08-06 17:56:25 +04:00
Fedor Morozov
e914fc2471
Merge branch 'master' of https://github.com/f-morozov/opencv
2013-08-06 17:49:29 +04:00
Fedor Morozov
4a4c5190f0
Documentation updates
2013-08-06 17:49:02 +04:00
Alexander Shishkov
3c218717a9
Merge branch 'master' of https://github.com/f-morozov/opencv
2013-08-06 15:41:39 +04:00
Alexander Shishkov
c4fb0e9dbb
few changes for compilation
2013-08-06 15:41:32 +04:00
Fedor Morozov
bef8d8192e
Minor fixes, new MergeDebevec
2013-08-06 15:24:01 +04:00
hbristow
8f92973b8c
Started documentation skeleton
2013-08-06 21:16:38 +10:00
Roman Donchenko
2911b12145
Merge pull request #1216 from alekcac:sphinx
2013-08-06 14:31:15 +04:00
Alexander Shishkov
b84b8db277
Removed useless .*
2013-08-06 14:28:07 +04:00
Roman Donchenko
dcaf923517
Merge remote-tracking branch 'origin/2.4'
...
Conflicts:
3rdparty/ffmpeg/ffmpeg_version.cmake
cmake/OpenCVFindLibsGrfmt.cmake
cmake/templates/cvconfig.h.cmake
modules/bioinspired/doc/retina/index.rst
modules/calib3d/doc/camera_calibration_and_3d_reconstruction.rst
modules/calib3d/src/precomp.hpp
modules/contrib/src/inputoutput.cpp
modules/contrib/src/precomp.hpp
modules/core/include/opencv2/core/internal.hpp
modules/core/include/opencv2/core/types_c.h
modules/core/src/drawing.cpp
modules/core/src/precomp.hpp
modules/core/src/system.cpp
modules/features2d/doc/common_interfaces_of_descriptor_matchers.rst
modules/features2d/doc/common_interfaces_of_feature_detectors.rst
modules/features2d/include/opencv2/features2d/features2d.hpp
modules/features2d/src/precomp.hpp
modules/flann/src/precomp.hpp
modules/gpu/doc/camera_calibration_and_3d_reconstruction.rst
modules/gpu/doc/image_filtering.rst
modules/gpu/doc/image_processing.rst
modules/gpu/doc/video.rst
modules/gpu/perf/perf_imgproc.cpp
modules/gpu/perf4au/main.cpp
modules/gpu/src/imgproc.cpp
modules/gpu/src/precomp.hpp
modules/gpu/test/test_imgproc.cpp
modules/highgui/CMakeLists.txt
modules/highgui/test/test_precomp.hpp
modules/imgproc/doc/structural_analysis_and_shape_descriptors.rst
modules/imgproc/src/precomp.hpp
modules/java/generator/src/cpp/Mat.cpp
modules/legacy/src/precomp.hpp
modules/ml/doc/k_nearest_neighbors.rst
modules/ml/src/precomp.hpp
modules/nonfree/doc/feature_detection.rst
modules/nonfree/src/precomp.hpp
modules/objdetect/include/opencv2/objdetect/objdetect.hpp
modules/objdetect/src/cascadedetect.cpp
modules/objdetect/src/hog.cpp
modules/objdetect/src/precomp.hpp
modules/objdetect/test/test_latentsvmdetector.cpp
modules/ocl/src/hog.cpp
modules/ocl/src/opencl/objdetect_hog.cl
modules/ocl/src/precomp.hpp
modules/photo/src/precomp.hpp
modules/stitching/src/precomp.hpp
modules/superres/perf/perf_precomp.hpp
modules/superres/src/optical_flow.cpp
modules/superres/src/precomp.hpp
modules/superres/test/test_precomp.hpp
modules/ts/include/opencv2/ts.hpp
modules/video/src/precomp.hpp
modules/videostab/src/precomp.hpp
modules/world/src/precomp.hpp
2013-08-06 13:56:49 +04:00
kocheganovvm
e9b9a6fc03
Fix unsequenced assignment (Bug #3191 ).
2013-08-06 08:08:13 +04:00
hbristow
b654413567
Added mixed-precision check when attempting to link to an OpenCV version with different bitness. Bindings now compiling and linking on my Windows 7 VM with VS2012 and Matlab R2013a
2013-08-06 13:01:57 +10:00
ozantonkal
731a931c0c
field of views are in radians
2013-08-05 19:35:20 +02:00
ozantonkal
32985aa724
fix camera constructor, add tentative KinectCamera method
2013-08-05 19:22:43 +02:00
ozantonkal
9c20e77013
fix conversion functions to use appropriate vtk function
2013-08-05 18:39:36 +02:00
Fedor Morozov
4c0f7f9e59
Tonemapping documentation update
2013-08-05 20:35:48 +04:00
Fedor Morozov
cb999a231e
Mantiuk's tonemapping
2013-08-05 19:31:10 +04:00
Fedor Morozov
17609b90c7
Mantiuk's tonemapping
2013-08-05 19:22:42 +04:00
hbristow
48aac747ca
removed pkg_resources (setuptools) dependency from jinja. Matlab module now has no python dependencies beyond the core python libs
2013-08-06 00:40:57 +10:00
ozantonkal
f8ad3c0204
fix field of view computation in setWindowSize
2013-08-05 16:06:02 +02:00
ozantonkal
119d97f1f6
remove old camera, rename new camera
2013-08-05 15:37:08 +02:00
ozantonkal
f060eee5a5
fix window_size setter, remove camera related old methods from viz3d
2013-08-05 15:10:17 +02:00
ozantonkal
439ba98e0a
initial implementation of projection matrix, 3D to window coordinates, window coordinates to 3D ray (not yet tested)
2013-08-05 13:01:21 +02:00
Roman Donchenko
b2d1d87ed1
Merge pull request #1225 from apavlenko:fix_format_security
2013-08-05 12:58:37 +04:00
Roman Donchenko
4fb2e9a85a
Merge pull request #1196 from rdm12:bugfix_3121_cvtcolor
2013-08-05 12:52:15 +04:00
Roman Donchenko
d92b638768
Merge pull request #1226 from apavlenko:fix_java_test_ellipse2poly
2013-08-05 12:38:19 +04:00
Andrey Pavlenko
7b0734caf9
fixing java test after fix in OpenCV library
2013-08-05 11:45:17 +04:00
hbristow
d00f4e267b
Added Windows dll versioning and Debug library postfix checks. Dependent libraries now being found by linker :)
2013-08-05 17:37:48 +10:00
Andrey Pavlenko
a06891851d
fixing compilation with -Werror=format-security enabled
2013-08-05 11:11:54 +04:00
Andrey Pavlenko
4c03afe006
Merge pull request #1079 from AlexeySpizhevoy:master
2013-08-05 10:54:44 +04:00
Andrey Pavlenko
6483754860
Merge pull request #1220 from asmorkalov:msmf_sizet_fix
2013-08-05 10:26:39 +04:00
Andrey Pavlenko
8a3aa1f5b6
Merge pull request #1221 from philippefoubert:branch_cmake_cmp0004
2013-08-05 10:26:23 +04:00
Andrey Pavlenko
af8a03e17f
Merge pull request #1222 from philippefoubert:branch_2.4_pvapi
2013-08-05 10:20:25 +04:00
Andrey Pavlenko
487ff4f3aa
Merge pull request #1151 from jet47:gpubgsegm-refactoring
2013-08-05 10:20:00 +04:00
hbristow
ecb506842b
Added Windows-specific configuration lookup for linker paths
2013-08-05 14:49:12 +10:00
Mathieu Barnachon
ff85575b28
Adding read/write functions to PCA class. Update PCA test.
2013-08-05 12:06:55 +12:00
Philippe FOUBERT
ebd413c696
Solve the problem seen when using recent versions of CMake (such as 2.8.11): OpenCVConfig.cmake violates the policy CMP0004.
...
Symptoms:
CMake Error at CMakeLists.txt:10 (add_executable):
Target "my_app" links to item "C:/Program Files " which has leading
or trailing whitespace. This is now an error according to policy CMP0004.
This problem occurs when building on Windows when we depend on libraries located (for example) in "C:\Program Files (x86)..."
2013-08-04 20:52:49 +02:00
Alexander Smorkalov
aada5f7844
Difference in method definition and declaration fixed (Bug #3189 ).
2013-08-04 22:34:36 +04:00
Andrey Pavlenko
a2ff1b07b3
Merge pull request #1219 from asmorkalov:winrt_neon
2013-08-04 21:59:06 +04:00
Alexander Smorkalov
2243118fc0
NEON instruction set enabled for WIN32 on ARM by default.
2013-08-04 08:47:42 -07:00
ozantonkal
0bb89e767a
fix field of view formula in camera class, implement get camera
2013-08-04 17:01:41 +02:00
hbristow
dfda79e673
Added passthrough of CXX FLAGS to mex compiler
2013-08-05 00:44:38 +10:00
