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
11 years ago
Roman Donchenko
beeb932d22
Boring changes - highgui.
11 years ago
Vladislav Vinogradov
2fae1d9507
removed ogl::Texture2D support from InputArray
12 years ago
Andrey Kamaev
b8ed00bd64
Compile OpenCV with GCC visibility set to hidden
12 years ago
Andrey Kamaev
0738ea7d0f
Make highgui.hpp independent from C API
12 years ago
Andrey Kamaev
2b1ef95415
Completely separate C and C++ API of OpenCV core
12 years ago
Andrey Kamaev
be7bbe3aa9
Drop cv:: prefix from cv::String used inside the cv namespace
12 years ago
Andrey Kamaev
762aefd71b
Compile opencv_test_core with cv::String instead of std::string
...
All tests passed!
12 years ago
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>
12 years ago
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.
12 years ago
Vladislav Vinogradov
a938534a7e
restored binary compatibility
12 years ago
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
12 years ago
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
12 years ago
OpenCV Buildbot
81f826db2b
Normalize line endings and whitespace
12 years ago
OpenCV Buildbot
04384a71e4
Normalize line endings and whitespace
12 years ago
Andrey Kamaev
cabddaeb4f
Revert "Issue #2035 Calling cv::namedWindow crashes on Android fixed."
...
This reverts commit 36135fc59d
.
12 years ago
Alexander Smorkalov
36135fc59d
Issue #2035 Calling cv::namedWindow crashes on Android fixed.
...
Window-related functions is guarded from calls from application code.
Old implementations with "no-gui" exception are stell compiled and linked to OpenCV library for binary compatibility.
12 years ago
Vadim Pisarevsky
c9f1490302
added variant of cv::imdecode with the specified output matrix
12 years ago
Vadim Pisarevsky
bb93651048
added support for bi-level PNG's (patch #2301 ; thanks to Costantino Grana)
12 years ago
Vadim Pisarevsky
2fd1e2ea57
merged all the latest changes from 2.4 to trunk
13 years ago
Vadim Pisarevsky
b253665f8c
added explicit VideoWriter::release(). Fixed video stream finalization (write remaining frames); Fixed occasional crash in the case of odd-width or odd-height videos; Fixed a few problems in ffmpeg tests. Positioning still does not work well.
13 years ago
Alexander Reshetnikov
3a564d1ae8
Updated displayOverlay's implementation & documentation (ticket #903 )
13 years ago
Vladislav Vinogradov
3afc97e67e
fixed new OpenGL functionality under Qt
13 years ago
Vladislav Vinogradov
bd4239be7b
moved OpenGL wrappers to separate header
...
added GlBuffer, GlTexture and GpuMat support to InputArray
replaced addTextOpenGl function by render + GlFont
13 years ago
Vladislav Vinogradov
9817252b23
added addTextOpenGl function
13 years ago
Vladislav Vinogradov
6b869f2ec3
minor fix
13 years ago
Vladislav Vinogradov
d7450c2449
added GlArrays class and pointCloudShow function
13 years ago
Vladislav Vinogradov
c2783af781
added OpenGL support to highgui under WIN32
13 years ago
Vadim Pisarevsky
448a252776
added compression strategy as a parameter (another request from ticket #1452 )
13 years ago
Vadim Pisarevsky
df5c60c50a
added missing cv::moveWindow & cv::resizeWindow
13 years ago
Vadim Pisarevsky
c593355e42
fixed declaration of imencode to make it usable in Python etc.
13 years ago
Vadim Pisarevsky
ae83fe7645
added hybrid (feature-based & meanshift-based) tracker (by Pushkar)
13 years ago
Vadim Pisarevsky
16ba62dcd5
added COLOR_... enumeration to imgproc.hpp and EVENT_... enumeration to highgui.hpp
14 years ago
Ilya Lysenkov
fce7ba4eaf
Added destroyAllWindows and docs (ticket #957 ).
14 years ago
Vadim Pisarevsky
c7a42e9682
started work on API & doc synchronization (in particular, Mat& => Input/OutputArray in the descriptions)
14 years ago
Vadim Pisarevsky
0c877f62e9
replaced "const InputArray&" => "InputArray"; made InputArray and OutputArray references. added "None()" constant (no array()).
14 years ago
Vadim Pisarevsky
abeeb40d46
a big patch; use special proxy types (Input/OutputArray, Input/OutputArrayOfArrays) for passing in vectors, matrices etc.
14 years ago
Vadim Pisarevsky
5b6a755719
almost finished Python wrappers
14 years ago
Vadim Pisarevsky
83f6085773
added more helper macros to the function declarations, to assist the Python wrapper generator. Fixed memleak in Mat::operator()(Range,Range) and the related functions (Mat::row, Mat::col etc.)
14 years ago
Vadim Pisarevsky
ebb9c61546
fixed bug with Mat::dataend initialization. Now morph-ex test passes; Also fixed CV_Assert() implementation
14 years ago
Vadim Pisarevsky
1b1eab8e67
added helper macros to the function declarations
14 years ago
Yannick Verdie
e65823fac2
Qt sample code and some fixes
14 years ago
Yannick Verdie
e8aad75446
Fixed bugs on Qt
15 years ago
Yannick Verdie
2c923c7eba
QT new functions:
...
- cvAddButton changed to match requirement
- CV_GUI_NORMAL and CV_GUI_EXPANDED done
- context menu with right click
15 years ago
Yannick Verdie
14bf624af4
QT new functions:
...
- cvAddButton done
- All the "actions" of the toolbar are working
- Window properties done
15 years ago
Yannick Verdie
c3eb7881f1
New functions with QT GUI:
...
- 3 new points mostly done:
- OpenGL support enabled (windows are rendered using GPU)
- Save current screen (with overlay and so on...) with shortcut CTRL+S
- Text rendering (with any system font, and possibility to set the style - normal, italic,... - the weight - normal, bold, ... - the color, the spacing between letters, and so on...)
15 years ago
Yannick Verdie
2f4d396506
New functions with QT GUI:
...
- save/load window parameters implemented !
15 years ago
Yannick Verdie
f69514eef7
New functions with QT GUI:
...
StatusBar with zoom/color/position information
user can display infor mation in statusbar with cvDisplayStatusBar(window,text,delay_ms)
15 years ago
Yannick Verdie
f2392f2e2f
New functions with QT GUI:
...
- fix c++ wrapper
- fix compilation bugs
15 years ago
Yannick Verdie
2f9aedfaab
New functions with QT GUI:
...
- fix c++ wrapper
- rename cvInformation in cvDisplayOverlay
15 years ago