generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
16,486 Commits 3 Branches 47 Tags
Commit Graph

65 Commits

Author SHA1 Message Date
Maxim Kostin
6724a0b8cd Added dummy highgui WinRT implementation 2015-06-15 15:59:16 +03:00
Vladislav Vinogradov
53862687d5 rename CudaMem -> HostMem to better reflect its purpose 2014-12-23 17:42:49 +03:00
Ashod Nakashian
006384edaf highgui: Support to change trackbar count in setTrackbarPos and replaced deprecated CreateToolbarEx in Windows. 2014-12-06 11:55:17 -05:00
Andrey Kamaev
f4ba8b13c7 Add cv::setWindowTitle to highgui 2014-11-18 16:54:03 +03:00
Adi Shavit
e45cf2173f [HighGUI] Updated mouse wheel delta to reside within the 'flags' variable. Updated C++ API. 2014-01-14 21:33:32 +02:00
Roman Donchenko
13cd0a0502 Merge remote-tracking branch 'origin/2.4' 
Original pull requests:
	#996 from jet47:gpu-nvcuvid-libraries
	#995 from jet47:fix-bug-2985
	#999 from snosov1:unreliable-results-fix
	#1005 from alekcac:doc_fix
	#1004 from jet47:fix-bug-3068
	#987 from jet47:bug-3085-fix
	#969 from pengx17:2.4_binary_cache
	#929 from dominikrose:mingw-libdc1394-2-windows
	#1000 from ivan-korolev:fix_sift_bug_2892
	#1001 from ivan-korolev:fix_stitching_bug_2405
	#998 from asmorkalov:android_cmake_mips_fix
	#993 from ivan-korolev:fix_videostab_bug_3023
	#988 from snosov1:3071-fix
	#986 from pengx17:2.4_initiated_context
	#982 from pengx17:2.4_fix_two_bugs
	#981 from SeninAndrew:ximea_camera_support_fix
	#991 from asmorkalov:android_javadoc_fix
	#972 from jet47:mog2-params-bug-2168
	#980 from SpecLad:include-config
	#973 from pengx17:2.4_oclclahe
	#903 from aks2:2.4
	#968 from asmorkalov:android_na_cproj_fix
	#971 from SpecLad:matchers-ctor
	#970 from asmorkalov:dshow_valid_check_fix
	#965 from apavlenko:fix_java_empty_mats

Conflicts:
	cmake/OpenCVModule.cmake
	modules/core/src/matmul.cpp
	modules/gpu/CMakeLists.txt
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/perf/perf_imgproc.cpp
	modules/ocl/src/imgproc.cpp
	modules/ocl/src/initialization.cpp
	modules/stitching/src/matchers.cpp
	modules/video/src/video_init.cpp
	modules/videostab/src/global_motion.cpp
 2013-06-19 15:25:37 +04:00
Vladislav Vinogradov
2fae1d9507 removed ogl::Texture2D support from InputArray 2013-06-10 12:40:30 +04:00
alex77git
c8abaea368 (tab to space) 2x 2013-05-20 12:06:25 +02:00
alex77git
bc59428b3a Bug #2966, insert CV_Assert(size.width>0 && size.height>0); in imshow() 2013-05-20 02:28:40 +02:00
Andrey Kamaev
0738ea7d0f Make highgui.hpp independent from C API 2013-04-08 15:47:29 +04:00
Andrey Kamaev
67073daf19 Merge branch '2.4' 2013-04-05 21:11:59 +04:00
Alexander Smorkalov
09bc99a0c0 HAVE_WIN32UI and HAVE_VFW checks and defines added. 2013-03-27 08:03:51 -07:00
Andrey Kamaev
be7bbe3aa9 Drop cv:: prefix from cv::String used inside the cv namespace 2013-03-22 22:14:50 +04:00
Andrey Kamaev
762aefd71b Compile opencv_test_core with cv::String instead of std::string 
All tests passed!
 2013-03-22 22:14:22 +04:00
Alexander Smorkalov
3d594c70ff Multiple Windows RT fixes 
TIFF build was fixed;
Direct Show back-end was enabled;
More accurate guards implemented.
 2013-03-19 17:46:01 -07:00
Alexander Smorkalov
06aff4e7b0 Initial Windows RT support commit. 
GPU module turned off;
TIFF support turned off;
Windows Managment and Video IO (VFW) turned off.
 2013-03-13 09:02:15 -07:00
Andrey Kamaev
ad5cddc007 Main module headers are moved 1 level up 
e.g. <opencv2/core/core.hpp> become <opencv2/core.hpp>

Also renamed <opencv2/core/opengl_interop.hpp> to <opencv2/core/opengl.hpp>
 2013-03-13 17:26:56 +04:00
Vladislav Vinogradov
ecb2ebfba4 Move opengl iterop code to cv::ogl namespace 
Fixed issues: #2737 #2848
 2013-03-12 18:13:11 +04:00
Andrey Kamaev
2a6fb2867e Remove all using directives for STL namespace and members 
Made all STL usages explicit to be able automatically find all usages of
particular class or function.
 2013-02-25 15:04:17 +04:00
Vladislav Vinogradov
a938534a7e restored binary compatibility 2013-02-21 12:18:08 +04:00
Vladislav Vinogradov
e06c3ec7c5 updated OpenGL functionality: 
* removed OpenGLFuncTab, now extensions are loaded internally
* added support of GlBuffer and GlTexture2D to InputArray/OutputArray
* added ELEMENT_ARRAY_BUFFER and PIXEL_PACK_BUFFER targets
* added copyFrom/copyTo method for GlBuffer and GlTexture2D
* removed GlFont
* removed pointCloudShow
* removed OpenGLCleanCallback
* added Access parameter to GlBuffer::mapHost
* added autoRelease parameter to all create methods
 2013-02-19 14:13:11 +04:00
Vladislav Vinogradov
08fbf667f9 refactored opengl functionality 
* removed OpenGLFuncTab, now extensions are loaded internally
* renamed GlTexture -> GlTexture2D
* added support of GlBuffer and GlTexture2D to InputArray/OutputArray
* added ELEMENT_ARRAY_BUFFER and PIXEL_PACK_BUFFER targets
* added copyFrom/copyTo method for GlBuffer and GlTexture2D
* removed GlFont
* removed pointCloudShow
* removed OpenGLCleanCallback
 2012-11-30 17:35:28 +04:00
Andrey Kamaev
b131dfeecd Build tutorial codes together with other samples 
These codes should be included into regular builds.
 2012-11-09 10:15:48 +04:00
OpenCV Buildbot
04384a71e4 Normalize line endings and whitespace 2012-10-17 15:32:23 +04:00
Andrey Kamaev
b368f99d03 Merged the trunk r8852:8880 2012-07-02 11:04:43 +00:00
Andrey Kamaev
17fd1c7c61 Merged recent changes from trunk - 8833,8848,8850 2012-06-29 07:52:34 +00:00
Marina Kolpakova
680a44189c merged the trunk r8704:8716 2012-06-28 16:13:29 +00:00
Andrey Kamaev
bd0e0b5800 Merged the trunk r8589:8653 - all changes related to build warnings 2012-06-15 13:04:17 +00:00
Vladislav Vinogradov
2d30480982 created wrappers for new NPP functions 
removed void integral(const GpuMat& src, GpuMat& sum, GpuMat& sqsum, Stream& stream) - it fails with NPP_NOT_IMPLEMENTED error
updated docs, accuracy and performance tests
 2012-02-22 10:00:53 +00:00
Anatoly Baksheev
84db4eb6fa fixed ~200 warnings for windows 
minor build system changes (now cuda code in opencv_core is compiled using CUDA_ARCH* cmake variables)
 2012-02-14 10:22:34 +00:00
Vladislav Vinogradov
3afc97e67e fixed new OpenGL functionality under Qt 2011-12-12 12:52:06 +00:00
Vladislav Vinogradov
bd4239be7b moved OpenGL wrappers to separate header 
added GlBuffer, GlTexture and GpuMat support to InputArray
replaced addTextOpenGl function by render + GlFont
 2011-11-30 06:20:29 +00:00
Vladislav Vinogradov
07debd6cb5 minor fix 2011-11-28 12:10:37 +00:00
Vladislav Vinogradov
9817252b23 added addTextOpenGl function 2011-11-28 11:50:46 +00:00
Vladislav Vinogradov
2a4fb155e1 added OpenGL support to Gtk realization of highgui 2011-11-28 08:23:26 +00:00
Vladislav Vinogradov
35e69a1ee3 fixed build with Qt 2011-11-27 10:13:08 +00:00
Vladislav Vinogradov
d7450c2449 added GlArrays class and pointCloudShow function 2011-11-23 10:05:24 +00:00
Vladislav Vinogradov
4d09737a02 fixed compilation error 2011-11-21 12:28:54 +00:00
Vladislav Vinogradov
c2783af781 added OpenGL support to highgui under WIN32 2011-11-21 11:58:52 +00:00
Vadim Pisarevsky
df5c60c50a added missing cv::moveWindow & cv::resizeWindow 2011-08-27 20:05:07 +00:00
Ilya Lysenkov
fce7ba4eaf Added destroyAllWindows and docs (ticket #957). 2011-06-20 13:24:48 +00:00
Vadim Pisarevsky
0c877f62e9 replaced "const InputArray&" => "InputArray"; made InputArray and OutputArray references. added "None()" constant (no array()). 2011-06-06 14:51:27 +00:00
Vadim Pisarevsky
2dc981aaa8 fixed bug with possible memory corruption in CvMat m = iarray.getMat(); expressions (ticket #1054) 2011-05-18 15:16:12 +00:00
Vadim Pisarevsky
abeeb40d46 a big patch; use special proxy types (Input/OutputArray, Input/OutputArrayOfArrays) for passing in vectors, matrices etc. 2011-04-17 13:14:45 +00:00
Yannick Verdie
e8aad75446 Fixed bugs on Qt 2010-07-31 18:04:28 +00:00
Yannick Verdie
c77e8fc638 Qt - debugging Linux and Windows 2010-07-27 17:29:22 +00:00
Yannick Verdie
bb2fe87b32 2010-07-26 12:28:33 +00:00
Yannick Verdie
2c923c7eba QT new functions: 
- cvAddButton changed to match requirement
 - CV_GUI_NORMAL and CV_GUI_EXPANDED done
 - context menu with right click
 2010-07-22 20:39:44 +00:00
Yannick Verdie
14bf624af4 QT new functions: 
- cvAddButton done
 - All the "actions" of the toolbar are working
 - Window properties done
 2010-07-20 09:39:36 +00:00
Vadim Pisarevsky
fa91788222 disabled Qt by default (until the code is stabilized) 2010-07-12 15:29:31 +00:00