mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-12-27 11:28:14 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
18,475 Commits 6 Branches 127 Tags 3 GiB
25b044e6c3
Commit Graph

1097 Commits

Author SHA1 Message Date
Adi Shavit
24333569aa Small fixes: typo, spacing and using ::ScreenToClient() instead of ::GetWindowRect() 2014-01-16 11:09:25 +02: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
Adi Shavit
fecd5c994b Added support for mouse-wheel events on Windows. 
To be used in the mouse callback like this:
    if (CV_EVENT_MOUSEWHEEL == CV_GET_MOUSEWHEEL_EVENT(event))
    {
       int delta= CV_GET_WHEEL_DELTA(event);
       // use delta...
    }
 2014-01-14 21:20:05 +02:00
Adi Shavit
9dc0bfc755 Small fix for extracting mouse coordinates on Windows, in a way that will always work with multiple monitors. 
This is the way recommended by Microsoft.
 2014-01-14 21:20:04 +02:00
Nick D'Ademo
25870fa66b Added PVAPI enums to highgui.hpp 
Added "PVAPI_" prefix to FrameStartTriggerMode definition
 2014-01-14 21:38:57 +11:00
Roman Donchenko
fee2ed37fc Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	modules/contrib/src/retina.cpp
	modules/core/include/opencv2/core/mat.hpp
	modules/core/src/algorithm.cpp
	modules/core/src/arithm.cpp
	modules/features2d/src/features2d_init.cpp
	modules/gpu/include/opencv2/gpu/gpu.hpp
	modules/gpu/perf/perf_imgproc.cpp
	modules/imgproc/src/generalized_hough.cpp
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/video/src/tvl1flow.cpp
	modules/video/src/video_init.cpp
 2014-01-14 11:53:59 +04:00
Nick D'Ademo
3cf5c0b991 Added get and set for extra PVAPI property: CV_CAP_PROP_FRAMESTARTTRIGGERMODE 2014-01-13 22:01:09 +11:00
Ilya Lavrenov
6b9ebcbf3d deleted extra semicolons 2014-01-07 02:52:30 +04:00
Roman Donchenko
795c108f2b Fixed MinGW build by declaring the minimal required Windows version. 
Also deleted miscellaneous remaining multimon cruft.
Deleted #include <winuser.h>, because <windows.h> includes it
already.

This should have a nice side effect of preventing us from
accidentally using any Windows API that's too new.
 2013-12-30 18:13:42 +04:00
Roman Donchenko
9dfb96389c Merge commit '4b885e206' into merge-2.4 2013-12-30 16:48:45 +04:00
Andrey Pavlenko
734bf8babd removing legacy stuff 2013-12-26 15:49:12 +04:00
Andrey Pavlenko
f9aa148ba9 eliminating VS2013 build warnings 2013-12-26 13:35:59 +04:00
Roman Donchenko
3c4b24d531 Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	CMakeLists.txt
	modules/highgui/src/cap.cpp
	modules/nonfree/src/surf.ocl.cpp
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/src/color.cpp
	modules/ocl/src/gftt.cpp
	modules/ocl/src/imgproc.cpp
	samples/ocl/facedetect.cpp
 2013-12-23 18:50:17 +04:00
Roman Donchenko
6e22be4100 Merge pull request #2003 from vbystricky:intelperc_camera_2.4 2013-12-20 17:06:27 +04:00
Vladimir Bystricky
d6a7e8f84f Remove TBB ifdef form code 2013-12-20 12:33:39 +04:00
Vladimir Bystricky
80d0593dbd Delete end comma in enumerations 2013-12-18 11:46:52 +04:00
Vladimir Bystricky
cc08e00876 Fix notes about cmake files. Fix build warning. 2013-12-17 16:13:55 +04:00
Vladimir Bystricky
4088013251 Add set/get depth generator properties by default. Add documentation 2013-12-17 12:00:40 +04:00
Vladimir Bystricky
e8d2a9752b Add support Creative Senz3D camera by Intel Perceptual Computing SDK 2013-12-13 17:25:16 +04:00
Roman Donchenko
90c28d254f Merge pull request #1961 from SpecLad:merge-2.4 2013-12-10 14:39:35 +04:00
Roman Donchenko
464a010f53 Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	modules/core/include/opencv2/core/operations.hpp
	modules/core/include/opencv2/core/version.hpp
	modules/core/src/gpumat.cpp
	modules/cudaimgproc/src/color.cpp
	modules/features2d/src/orb.cpp
	modules/imgproc/src/samplers.cpp
	modules/ocl/include/opencv2/ocl/matrix_operations.hpp
	modules/ocl/include/opencv2/ocl/ocl.hpp
	samples/ocl/facedetect.cpp
 2013-12-10 12:51:00 +04:00
Anatoly Baksheev
f62ffa2aea compilation 2013-12-07 18:58:29 +04:00
Josep Bosch
2153453fd1 Fixed little issue with mouse callback refering to issue 3409. Was using round instead of floor. 2013-12-04 22:32:20 +01:00
Roman Donchenko
d58cd9851f Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	CMakeLists.txt
	cmake/OpenCVDetectCUDA.cmake
	doc/tutorials/features2d/feature_flann_matcher/feature_flann_matcher.rst
	modules/core/src/cmdparser.cpp
	modules/gpu/CMakeLists.txt
	modules/gpu/doc/introduction.rst
	modules/gpu/perf/perf_video.cpp
	modules/highgui/doc/reading_and_writing_images_and_video.rst
	modules/ocl/src/cl_context.cpp
	modules/video/include/opencv2/video/background_segm.hpp
	samples/cpp/image_sequence.cpp
	samples/cpp/tutorial_code/ImgTrans/HoughCircle_Demo.cpp
	samples/python/chessboard.py
	samples/python/cvutils.py
	samples/python/demhist.py
	samples/python/dft.py
	samples/python/distrans.py
	samples/python/edge.py
	samples/python/ffilldemo.py
	samples/python/fitellipse.py
	samples/python/houghlines.py
	samples/python/inpaint.py
	samples/python/logpolar.py
	samples/python/morphology.py
	samples/python/numpy_array.py
	samples/python/watershed.py
 2013-12-03 17:35:21 +04:00
Andrey Pavlenko
429ab8ebee Merge pull request #1845 from StevenPuttemans:bugfix_3306 2013-11-29 23:08:20 +04:00
Roman Donchenko
10aec14a4d Merge pull request #1849 from StevenPuttemans:feature_3375_documentation 2013-11-27 13:22:31 +04:00
Roman Donchenko
9c2272d520 Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	.gitignore
	CMakeLists.txt
	doc/CMakeLists.txt
	modules/calib3d/src/stereosgbm.cpp
	modules/core/include/opencv2/core/mat.hpp
	modules/highgui/src/cap_openni.cpp
	modules/ml/include/opencv2/ml/ml.hpp
	modules/objdetect/src/hog.cpp
	modules/ocl/perf/perf_color.cpp
	modules/ocl/src/arithm.cpp
	modules/ocl/src/filtering.cpp
	modules/ocl/src/imgproc.cpp
	modules/ocl/src/optical_flow_farneback.cpp
	platforms/scripts/camera_build.conf
	platforms/scripts/cmake_android_all_cameras.py
	samples/cpp/Qt_sample/main.cpp
	samples/cpp/tutorial_code/introduction/windows_visual_studio_Opencv/Test.cpp
 2013-11-26 15:05:26 +04:00
StevenPuttemans
6f892b10ff Applied feature #3375 and fix of pull 1842 to avoid merging problems later 2013-11-25 10:53:03 +01:00
StevenPuttemans
1b0297d92b Added fixes mentioned in bugreport 3306 
- Added author provided fixes
- Added code example
- Added documentation fixes
 2013-11-25 09:35:23 +01:00
Roman Donchenko
b8f5fcf3f9 Merge pull request #1776 from philippefoubert:merge_upstream_2.4_ximea 2013-11-21 12:03:02 +04:00
Andrey Pavlenko
8d1a8df1a9 Merge pull request #1824 from vpisarev:ocl_experiments5 2013-11-20 19:14:40 +04:00
Roman Donchenko
3703c7040a Merge pull request #1828 from SpecLad:merge-2.4 2013-11-20 16:08:53 +04:00
Roman Donchenko
b197ec9413 Merge pull request #1761 from bhuroc:qtkit-video-file-2.4 2013-11-20 13:36:37 +04:00
Philippe FOUBERT
78e16a906b Back to the previous coding way (using the macro with the goto). 2013-11-19 21:51:47 +01:00
Roman Donchenko
aacf188e83 Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/src/arithm.cpp
	modules/ocl/src/build_warps.cpp
	modules/ocl/src/color.cpp
	modules/ocl/src/haar.cpp
	modules/ocl/src/imgproc.cpp
	modules/ocl/src/split_merge.cpp
	modules/ocl/test/test_color.cpp
	samples/cpp/3calibration.cpp
	samples/cpp/OpenEXRimages_HDR_Retina_toneMapping.cpp
	samples/cpp/OpenEXRimages_HDR_Retina_toneMapping_video.cpp
	samples/cpp/Qt_sample/main.cpp
	samples/cpp/camshiftdemo.cpp
	samples/cpp/descriptor_extractor_matcher.cpp
	samples/cpp/distrans.cpp
	samples/cpp/generic_descriptor_match.cpp
	samples/cpp/grabcut.cpp
	samples/cpp/morphology2.cpp
	samples/cpp/segment_objects.cpp
	samples/cpp/stereo_calib.cpp
	samples/cpp/tutorial_code/Histograms_Matching/compareHist_Demo.cpp
	samples/cpp/tutorial_code/core/mat_mask_operations/mat_mask_operations.cpp
	samples/cpp/tutorial_code/introduction/display_image/display_image.cpp
	samples/cpp/tutorial_code/introduction/windows_visual_studio_Opencv/Test.cpp
	samples/cpp/tutorial_code/objectDetection/objectDetection.cpp
	samples/cpp/tutorial_code/objectDetection/objectDetection2.cpp
	samples/cpp/video_dmtx.cpp
 2013-11-19 16:21:09 +04:00
Vadim Pisarevsky
e2bbe7597b fixed few compile errors and doc build errors 2013-11-18 13:48:04 -05:00
Vadim Pisarevsky
d914f20a4c updated patch to bring in the first functions with "transparent API" 2013-11-18 11:48:00 -05:00
Roman Donchenko
bb4bf7a1f9 Merge pull request #1811 from Nerei:fixed_some_build_errors 2013-11-18 18:09:44 +04:00
Anatoly Baksheev
d8600d3d13 fixed all Viz warnings 
moved some headers to precomp.hpp
 2013-11-17 14:13:11 +04:00
Anatoly Baksheev
5c6248005a fixed warnings 2013-11-17 14:08:57 +04:00
Anatoly Baksheev
13bb236ad5 fixed some warnings 2013-11-16 21:18:36 +04:00
Roman Donchenko
2e79dde357 Merge pull request #1799 from SpecLad:avformat-53-6 2013-11-15 11:51:59 +04:00
Roman Donchenko
3b7acf2657 Fix building with FFmpeg 0.8. 
avformat_find_stream_info was introduced in Libav avformat 53.3,
but it was only merged to FFmpeg in avformat 53.6.

In Libav avformat 53.3-53.5 av_find_stream_info is not removed
(only deprecated), so this shouldn't break building with that.
 2013-11-14 17:25:46 +04:00
Roman Donchenko
411629a57d Merge pull request #1786 from SpecLad:cap-images-file-pattern 2013-11-13 17:00:20 +04:00
Roman Donchenko
28e0d3d771 Merge pull request #1784 from SpecLad:ffmpeg-no-png 2013-11-13 15:52:42 +04:00
Roman Donchenko
b8e3d3f791 In the image sequence capture, only search for the ordinal in the file name. 
Searching in directory names can yield confusing results; e.g. if
the input is "jpeg2000/image1.jp2", it will infer the pattern
"jpeg%04d/image1.jp2", which is likely not what the user intended.

If the user really desires for the variable part to be in the
directory name, it can always use an explicit pattern.
 2013-11-12 16:26:21 +04:00
Philippe FOUBERT
93120775cd Using four spaces for indentation. 2013-11-11 20:40:18 +01:00
Roman Donchenko
405227d531 Replaced the image used in the Highgui_Video.ffmpeg_image test. 
Our prebuilt FFmpeg Windows binaries don't have PNG support enabled
(because that requires zlib), so that makes a PNG image a bad choice
for this test.

When FFmpeg doesn't support PNG, VideoCapture falls back to the
"image sequence" implementation, which doesn't work for single images.
 2013-11-11 18:30:04 +04:00
Roman Donchenko
eff53e95f9 Fixed the "image sequence" capture not failing when a pattern isn't found. 
at can't be a null pointer, so the condition was always false, and
a nonsensical pattern like "image.png%00d" was being inferred.
 2013-11-11 18:12:49 +04:00
Roman Donchenko
4f1aed98de Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	.gitignore
	modules/contrib/src/detection_based_tracker.cpp
	modules/core/include/opencv2/core/core.hpp
	modules/core/include/opencv2/core/internal.hpp
	modules/core/src/gpumat.cpp
	modules/core/src/opengl.cpp
	modules/gpu/src/cuda/safe_call.hpp
	modules/highgui/src/cap.cpp
	modules/imgproc/include/opencv2/imgproc/imgproc.hpp
	modules/ocl/doc/image_processing.rst
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/perf/perf_haar.cpp
	modules/ocl/src/haar.cpp
	modules/ocl/src/imgproc.cpp
	modules/ocl/src/kmeans.cpp
	modules/ocl/src/svm.cpp
	modules/ocl/test/test_objdetect.cpp
	samples/ocl/adaptive_bilateral_filter.cpp
 2013-11-11 16:55:36 +04:00
Philippe FOUBERT
05d9375759 Trailing whitespace removal. 2013-11-11 10:26:28 +01:00
Philippe FOUBERT
8b0fc04d93 Fix the build of OpenCV with XIMEA on Windows 64 bits: 
- crosses initializations in "cap_ximea.cpp" (which also contained some awfull "goto" instructions)
  - the "CMAKE_CL_64" variable is not initialized when using mingw

PR#1039 modified to be able to merge on branch 2.4
 2013-11-10 17:46:59 +01:00
Bo Hu
c88fa27b1d Removed trailing whitespace in cap_qtkit.mm. 2013-11-06 13:33:17 -08:00
Bo Hu
114579c33b Added proper testing of the end of quicktime video files. 
CvCaptureFile::grabFrame() always returns 1 regardless, which causes
dead loop when relying on the return value of VideoCapture::read().
 2013-11-06 13:32:11 -08:00
Roman Donchenko
9c83f6c4fb Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	cmake/OpenCVDetectCUDA.cmake
	modules/core/include/opencv2/core/version.hpp
	modules/cudacodec/src/ffmpeg_video_source.cpp
	modules/gpu/src/video_writer.cpp
	modules/highgui/test/test_ffmpeg.cpp
	modules/highgui/test/test_video_io.cpp
	modules/highgui/test/test_video_pos.cpp
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/include/opencv2/ocl/private/util.hpp
	modules/ocl/src/arithm.cpp
	modules/ocl/src/blend.cpp
	modules/ocl/src/canny.cpp
	modules/ocl/src/cl_operations.cpp
	modules/ocl/src/filtering.cpp
	modules/ocl/src/haar.cpp
	modules/ocl/src/imgproc.cpp
	modules/ocl/src/kmeans.cpp
	modules/ocl/src/moments.cpp
	modules/ocl/src/safe_call.hpp
	modules/ocl/src/split_merge.cpp
	modules/ocl/test/test_moments.cpp
	samples/ocl/squares.cpp
 2013-11-05 16:38:23 +04:00
Roman Donchenko
d6a7a6d503 VideoCapture: copy the captured frame, to avoid dangling Mats 
Previously, VideoCapture::retrieve would return a Mat that referenced
the internal IplImage. Since the latter is rewritten every time a
frame is captured, it means that if the user captures two frames in a row,
the first frame would reference nothing. Similar if a user captures a frame,
then destroys the VideoCapture instance.

Note that the other branch of the if isn't affected, since flip allocates
a new Mat.
 2013-10-29 18:47:08 +04:00
Roman Donchenko
36b5180aa1 Another FFmpeg fix from master. 
From commit dd74a851, to be exact. Now cap_ffmpeg.cpp should actually
build if HAVE_FFMPEG is true.

Also modified some gpu sources in a similar manner.
 2013-10-25 16:08:14 +04:00
Roman Donchenko
1188894133 Fixed indentation in CV_FFmpegWriteBigVideoTest::run. 2013-10-25 14:37:54 +04:00
Roman Donchenko
2ca49eef37 Added stupid hacks to make the video tests pass with FFmpeg 2.0.2. 
Need to go back at some point and fix this for real.

(cherry picked from commit dfe07df87b)
 2013-10-25 14:34:02 +04:00
Roman Donchenko
5a5d569d72 Changed MPEG-2 resolution in the FFmpeg test. 
Newer FFmpeg prohibits 4096x4096 MPEG-2, presumably because it violates
the standard.

http://git.videolan.org/gitweb.cgi/ffmpeg.git/?p=ffmpeg.git;a=commit;h=7fb87bc5f24b1be13269109506c05e4c54695b5e

(cherry picked from commit 424a7b0ab0)

Conflicts:
	modules/highgui/test/test_ffmpeg.cpp
 2013-10-25 14:31:27 +04:00
Roman Donchenko
260c2e0b08 Decoupled test_ffmpeg.cpp from ffmpeg_codecs.hpp. 
(cherry picked from commit 3f3ae33327)
 2013-10-25 14:29:37 +04:00
Roman Donchenko
dfe07df87b Added stupid hacks to make the video tests pass with FFmpeg 2.0.2. 
Need to go back at some point and fix this for real.
 2013-10-24 14:09:08 +04:00
Roman Donchenko
424a7b0ab0 Changed MPEG-2 resolution in the FFmpeg test. 
Newer FFmpeg prohibits 4096x4096 MPEG-2, presumably because it violates
the standard.

http://git.videolan.org/gitweb.cgi/ffmpeg.git/?p=ffmpeg.git;a=commit;h=7fb87bc5f24b1be13269109506c05e4c54695b5e
 2013-10-23 17:42:00 +04:00
Roman Donchenko
3f3ae33327 Decoupled test_ffmpeg.cpp from ffmpeg_codecs.hpp. 
This should actually remove the need for the workaround from
the previous commit.
 2013-10-23 14:56:37 +04:00
Roman Donchenko
eb86d37b26 Removed some dubious FFmpeg hack that no longer works. 2013-10-23 14:56:37 +04:00
Roman Donchenko
4036f6a3d0 Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	apps/CMakeLists.txt
	modules/contrib/CMakeLists.txt
	modules/core/include/opencv2/core/version.hpp
	modules/imgproc/include/opencv2/imgproc/imgproc.hpp
	modules/java/generator/gen_java.py
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/src/cl_runtime/cl_runtime.cpp
	modules/ocl/src/columnsum.cpp
	modules/ocl/src/filtering.cpp
	modules/ocl/src/imgproc.cpp
	modules/ocl/test/main.cpp
	modules/ocl/test/test_color.cpp
	modules/ocl/test/test_imgproc.cpp
	samples/gpu/CMakeLists.txt
 2013-10-22 14:28:00 +04:00
Roman Donchenko
83b36dcbcf Merge pull request #1459 from asmorkalov:ocv_qt_segflt_fix 2013-10-18 18:39:08 +04:00
Vladislav Vinogradov
fa70f95272 fix imshow under Windows with OpenGL support: 
we doesn't create OpenGL windows by default
OpenGL window must be created by user via namedWindow
 2013-10-17 20:58:33 +04:00
Tony
5368f12b33 Rework gtk3 window resize and draw cleanup 
The gtk3 resize functions fail to shrink the window after it has been
resized. This edit changes this and allows the window to be shrunk
back to its original size.

This edit also cleans up the draw/expose functions.
 2013-10-15 21:49:20 +01:00
Alexander Alekhin
e845184843 Merge remote-tracking branch 'upstream/2.4' into merge-2.4 
* #1538 from StevenPuttemans:bugfix_3283
* #1545 from alalek:ocl_test_fix_rng
* #1551 from alalek:cmake_install_win
* #1570 from ilya-lavrenov:ipp_warn_fix
* #1573 from alalek:perf_simple_strategy
* #1574 from alalek:svm_workaround
* #1576 from alalek:ocl_fix_cl_double
* #1577 from ilya-lavrenov:ocl_setto_opencl12
* #1578 from asmorkalov:android_fd_cp_fix
* #1579 from ilya-lavrenov:ocl_norm
* #1582 from sperrholz:ocl-arithm-additions
* #1586 from ilya-lavrenov:ocl_setto_win_fix
* #1589 from ilya-lavrenov:pr1582_fix
* #1591 from alalek:ocl_remove_cl_hpp_h
* #1592 from alalek:ocl_program_cache_update
* #1593 from ilya-lavrenov:ocl_war_on_double
* #1594 from ilya-lavrenov:ocl_perf
* #1595 from alalek:cl_code_cleanup
* #1596 from alalek:test_fix_run_py
* #1597 from alalek:ocl_fix_cleanup
* #1598 from alalek:ocl_fix_build_mac
* #1599 from ilya-lavrenov:ocl_mac_kernel_warnings
* #1601 from ilya-lavrenov:ocl_fix_tvl1_and_sparse
* #1602 from alalek:ocl_test_dump_info
* #1603 from ilya-lavrenov:ocl_disable_svm_noblas
* #1605 from alalek:ocl_fixes
* #1606 from ilya-lavrenov:ocl_imgproc
* #1607 from ilya-lavrenov:ocl_fft_cleanup
* #1608 from alalek:fix_warn_upd_haar
* #1609 from ilya-lavrenov:ocl_some_optimization
* #1610 from alalek:ocl_fix_perf_kalman
* #1612 from alalek:ocl_fix_string_info
* #1614 from ilya-lavrenov:ocl_svm_misprint
* #1616 from ilya-lavrenov:ocl_cvtColor
* #1617 from ilya-lavrenov:ocl_info
* #1622 from a0byte:2.4
* #1625 from ilya-lavrenov:to_string

Conflicts:
	cmake/OpenCVConfig.cmake
	cmake/OpenCVDetectPython.cmake
	cmake/OpenCVGenConfig.cmake
	modules/core/CMakeLists.txt
	modules/nonfree/src/surf.ocl.cpp
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/include/opencv2/ocl/private/util.hpp
	modules/ocl/perf/main.cpp
	modules/ocl/src/arithm.cpp
	modules/ocl/src/cl_operations.cpp
	modules/ocl/src/cl_programcache.cpp
	modules/ocl/src/color.cpp
	modules/ocl/src/fft.cpp
	modules/ocl/src/filtering.cpp
	modules/ocl/src/gemm.cpp
	modules/ocl/src/haar.cpp
	modules/ocl/src/imgproc.cpp
	modules/ocl/src/matrix_operations.cpp
	modules/ocl/src/pyrlk.cpp
	modules/ocl/src/split_merge.cpp
	modules/ocl/src/svm.cpp
	modules/ocl/test/main.cpp
	modules/ocl/test/test_fft.cpp
	modules/ocl/test/test_moments.cpp
	modules/ocl/test/test_objdetect.cpp
	modules/ocl/test/test_optflow.cpp
	modules/ocl/test/utility.hpp
	modules/python/CMakeLists.txt
	modules/ts/include/opencv2/ts.hpp
	modules/ts/src/ts_perf.cpp
	samples/android/face-detection/jni/DetectionBasedTracker_jni.cpp
 2013-10-15 20:08:52 +04:00
Tony
d4df373999 Code cleanup 
Remove redundent #if defs from code
 2013-10-09 20:50:35 +01:00
Alexander Alekhin
555c505b70 update cmake 'install' target for Windows platform 
Allow to build samples via OpenCV binaries from distribution package
(find_package with OpenCV_DIR).
 2013-10-09 17:49:10 +04:00
Roman Donchenko
dfb698dc64 Merge pull request #1581 from SpecLad:merge-2.4 2013-10-09 12:33:50 +04:00
Roman Donchenko
f07769e9d8 Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	cmake/OpenCVDetectOpenCL.cmake
	cmake/OpenCVModule.cmake
	modules/imgproc/src/floodfill.cpp
	modules/nonfree/src/surf.ocl.cpp
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/include/opencv2/ocl/private/util.hpp
	modules/ocl/perf/main.cpp
	modules/ocl/src/arithm.cpp
	modules/ocl/src/blend.cpp
	modules/ocl/src/build_warps.cpp
	modules/ocl/src/canny.cpp
	modules/ocl/src/cl_programcache.hpp
	modules/ocl/src/columnsum.cpp
	modules/ocl/src/haar.cpp
	modules/ocl/src/hog.cpp
	modules/ocl/src/imgproc.cpp
	modules/ocl/src/initialization.cpp
	modules/ocl/src/match_template.cpp
	modules/ocl/src/matrix_operations.cpp
	modules/ocl/src/mcwutil.cpp
	modules/ocl/src/moments.cpp
	modules/ocl/src/mssegmentation.cpp
	modules/ocl/src/precomp.hpp
	modules/ocl/src/pyrdown.cpp
	modules/ocl/src/pyrlk.cpp
	modules/ocl/src/pyrup.cpp
	modules/ocl/src/split_merge.cpp
	modules/ocl/src/stereo_csbp.cpp
	modules/ocl/src/stereobm.cpp
	modules/ocl/test/main.cpp
	samples/ocl/bgfg_segm.cpp
	samples/ocl/facedetect.cpp
	samples/ocl/pyrlk_optical_flow.cpp
	samples/ocl/squares.cpp
	samples/ocl/stereo_match.cpp
	samples/ocl/surf_matcher.cpp
	samples/ocl/tvl1_optical_flow.cpp
 2013-10-08 17:57:23 +04:00
Roman Donchenko
685eceb68a Merge pull request #1567 from ilya-lavrenov:warn_fix 2013-10-08 13:50:49 +04:00
Ilya Lavrenov
35d9ce0c0c fixed warnings 2013-10-08 12:46:43 +04:00
Roman Donchenko
801054d611 Merge pull request #1566 from SpecLad:Wshadow-openni 2013-10-07 15:48:40 +04:00
Roman Donchenko
744f4b1609 Merge pull request #1565 from SpecLad:cmake-new-ptr 2013-10-04 18:14:34 +04:00
Roman Donchenko
3cfad385ec Fix a -Wshadow warning in cap_openni.cpp. 2013-10-04 14:23:06 +04:00
Roman Donchenko
32630dbf61 Adapt cap_openni.cpp to the new Ptr. 2013-10-04 13:51:58 +04:00
Roman Donchenko
1817a07a5e Fixed a -Wnull-conversion Clang warning in cap_gstreamer.cpp. 2013-10-03 12:11:50 +04:00
Roman Donchenko
fa9d092c43 Fix a -Wparentheses-equality Clang warning in cap_libv4l.cpp. 2013-10-03 12:04:57 +04:00
Tony
81d6842b8e These changes introduce Gtk3 support into the highgui module. 
A new option WITH_GTK3 has been added to the cmake configure system to enable compilation under Gtk version 3.The flag HAVE_GTK3 is also introduced to select the new Gtk3 code in the source files. (Gtk2 is disbled when Gtk3 is selected).

window_gtk.cpp has been modified to remove obsolete (and deleted from libgtk 3) and introduce new Gtk3 code in its place when compiled for Gtk3.

To compile for Gtk2, disable WITH_GTK3 in cmake. To build for Gtk3 both WITH_GTK and WITH_GTK3 must be selected.
 2013-10-02 21:16:40 +01:00
Roman Donchenko
30d7e1c33d Merge remote-tracking branch 'origin/master' into merge-2.4 
Conflicts:
	doc/tutorials/bioinspired/retina_model/retina_model.rst~
 2013-10-02 13:37:33 +04:00
Roman Donchenko
1ac1b9ae35 Merge pull request #1474 from f-morozov:for_pr 2013-10-02 11:49:54 +04:00
Roman Donchenko
6133aeede8 Merge branch 'master' into merge-2.4 
Conflicts:
	doc/tutorials/definitions/tocDefinitions.rst
 2013-10-01 17:37:05 +04:00
Roman Donchenko
81eb4bd8be Merge remote-tracking branch 'origin/2.4' 
Conflicts:
	doc/tutorials/features2d/feature_detection/feature_detection.rst
	modules/bioinspired/doc/retina/index.rst
	modules/core/include/opencv2/core/core.hpp
	modules/core/include/opencv2/core/mat.hpp
	modules/core/include/opencv2/core/operations.hpp
	modules/core/src/stat.cpp
	modules/features2d/include/opencv2/features2d/features2d.hpp
	modules/imgproc/src/filter.cpp
	modules/legacy/src/dpstereo.cpp
	modules/nonfree/src/surf.ocl.cpp
	modules/ocl/doc/image_processing.rst
	modules/ocl/doc/object_detection.rst
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/include/opencv2/ocl/private/util.hpp
	modules/ocl/src/arithm.cpp
	modules/ocl/src/canny.cpp
	modules/ocl/src/filtering.cpp
	modules/ocl/src/imgproc.cpp
	modules/ocl/src/initialization.cpp
	modules/ocl/src/matrix_operations.cpp
	modules/ocl/src/pyrdown.cpp
	modules/ocl/src/pyrup.cpp
	modules/ocl/src/split_merge.cpp
	modules/ocl/test/test_objdetect.cpp
	modules/ocl/test/utility.hpp
 2013-10-01 15:57:33 +04:00
Roman Donchenko
e0f5a2e532 Merge pull request #1512 from Exocoder:pre-gtk3 2013-10-01 12:09:17 +04:00
Tony
0d06b1dced Change true for TRUE 
The second parameter of gtk_widget_set_realized is of type gboolean
(gint). This is to ensure compatibility on alternative compilers and
platforms.
 2013-09-30 21:04:43 +01:00
Alexander Smorkalov
8cb0921252 pr #1464 reverted as breaking the build for Linux without libv4l library. 2013-09-27 12:17:55 +04:00
Tony
97fc1e10a7 Replace obsolete Gtk symbols 
This update replaces depreciated Gtk1.x symbols with Gtk2.x symbols in
preparation for adding Gtk3 support. These edits aim to be fully
compatible with Gtk2.x, allowing backward compatibility.

The following symbols have been replaced in this commit:

Gtk symbols that have been moved to the Gdk library:
 - GtkType -> Gtype
 - GTK_CHECK_CAST -> G_TYPE_CHECK_INSTANCE_CAST
 - GTK_CHECK_TYPE -> G_TYPE_CHECK_INSTANCE_TYPE
 - gtk_signal_connect -> g_signal_connect
 - GTK_SIGNAL_FUNC -> G_CALLBACK
 - gtk_type_class -> g_type_class_peek
 - gtk_type_new-> g_object_new
 - GtkTypeInfo -> GtypeInfo (Not required for
   g_type_register_static_simple)
 - gtk_type_unique -> g_type_register_static_simple
 - gdk_draw_image_rgb -> replaced by gdk_cairo_source_pixbuf
   NB: This requires porting to use cairo contexts and GdkPixbufs.

The following gtk symbols are changed for their modern equivalent:
 - GTK_WIDGET_REALIZED -> gtk_widget_get_realized
 - GTK_OBJECT_FLAGS -> gtk_widget_set_realized

Symbols without replacement:
 - gtk_range_set_update_policy -> No replacement; as default policy is
   set to continuous we can delete this line.
 2013-09-26 18:31:44 +01:00
Fedor Morozov
c9ace38897 Docs updated, added InputArray, fixes for makePtr,... 2013-09-26 19:02:35 +04:00
Alexander Smorkalov
26a1a93295 Merge pull request #1464 from StevenPuttemans:bugfix_3186_second 2013-09-26 12:16:02 +04:00
Alexander Smorkalov
6057414a93 Merge pull request #1199 from devernay:2.4-qtkit 2013-09-24 15:36:16 +04:00
StevenPuttemans
1b1fb131b3 Attempt at fixing bug 3186 2013-09-23 16:51:02 +02:00
Fedor Morozov
f99be6bda6 Mergin itseez 2013-09-18 18:55:12 +04:00
Alexander Smorkalov
06a7a1ac47 Bug #1890 Opencv 2.4.0 with QT 4.7.4 and cvcreatebutton exception fixed. 
QVector range check exception fixed.
 2013-09-16 13:42:15 +04: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
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
41b8479d03 Merge pull request #1376 from StevenPuttemans:bugfix_3186 2013-09-09 18:33:11 +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
Roman Donchenko
beeb932d22 Boring changes - highgui. 2013-09-05 18:26:43 +04:00
Roman Donchenko
fd3b2326b4 Merge pull request #1373 from abidrahmank:pykeypoints 2013-09-04 11:53:33 +04: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
Alexander Shishkov
e354fa3fd1 fixed test data in highgui test for HDR 2013-09-03 14:24:14 +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
Vladislav Vinogradov
a41006754e fix documentation 2013-09-02 14:00:44 +04:00
Gabe Schwartz
b2bedef26f Added interlace handling to PNG decoder. 
libpng 1.5+ recommends a call to png_set_interlace_handling() if you use
png_read_update_info and png_read_image. It will generate a warning
without it.
 2013-08-30 09:49:24 -04:00
Gabe Schwartz
e2441e0034 Removed incorrect iCCP chunks from GUI resources. 
Also removed malformed tEXt chunk from a logo PNG.
 2013-08-30 09:49:24 -04:00
StevenPuttemans
e7921c3fe7 Added changes suggested by bug #3186 : fixing the unplugging of webcam 2013-08-30 13:16:18 +02:00
abidrahmank
14af369640 Python bindings for KeyPoint methods 
Usage:

import numpy as np
import cv2
img = cv2.imread('messi5.jpg',0)
sift = cv2.SIFT()
kp = sift.detect(img)

pts = cv2.KeyPoint_convert(kp)

kps = cv2.KeyPoint_convert(pts.reshape(-1,1,2))

overlap = cv2.KeyPoint_overlap(kp[0],kp[1])
 2013-08-30 11:11:06 +05:30
Roman Donchenko
2d6f35d6ed Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	modules/gpuwarping/src/cuda/resize.cu
	modules/gpuwarping/src/resize.cpp
	modules/gpuwarping/test/test_resize.cpp
	modules/ocl/perf/main.cpp
	modules/ocl/perf/perf_calib3d.cpp
	modules/ocl/perf/perf_canny.cpp
	modules/ocl/perf/perf_color.cpp
	modules/ocl/perf/perf_haar.cpp
	modules/ocl/perf/perf_match_template.cpp
	modules/ocl/perf/perf_precomp.cpp
	modules/ocl/perf/perf_precomp.hpp
 2013-08-27 19:15:47 +04:00
Roman Donchenko
9ed475cf52 War on Whitespace, master edition: file endings. 2013-08-27 14:23:26 +04:00
Roman Donchenko
9b92545ce6 War on Whitespace, master edition: trailing spaces. 2013-08-27 13:57:24 +04:00
Roman Donchenko
2c4bbb313c Merge commit '43aec5ad' into merge-2.4 
Conflicts:
	cmake/OpenCVConfig.cmake
	cmake/OpenCVLegacyOptions.cmake
	modules/contrib/src/retina.cpp
	modules/gpu/doc/camera_calibration_and_3d_reconstruction.rst
	modules/gpu/doc/video.rst
	modules/gpu/src/speckle_filtering.cpp
	modules/python/src2/cv2.cv.hpp
	modules/python/test/test2.py
	samples/python/watershed.py
 2013-08-27 13:26:44 +04:00
Roman Donchenko
525b6eca2e Merge pull request #1311 from leszekhanusz:png_palette_alpha 2013-08-26 16:59:45 +04:00
Fedor Morozov
e2e604eb18 HDR writing bug fix 2013-08-22 21:13:50 +04:00
Roman Donchenko
6fed0e85c2 Cut down on the use of ZLIB_LIBRARY/ZLIB_INCLUDE_DIR. 
They're not listed in the documentation for the FindZLIB module,
so we shouldn't use them unless necessary.
 2013-08-22 18:17:19 +04:00
Roman Donchenko
3c137f7a04 Converted tabs to spaces. 2013-08-21 18:59:26 +04:00
Roman Donchenko
e9a28f66ee Normalized file endings. 2013-08-21 18:59:25 +04:00
Roman Donchenko
f55740da70 Deleted all trailing whitespace. 2013-08-21 18:59:24 +04:00
Hanusz Leszek
32635a6834 using unsigned char instead of uint8_t to compile under windows 2013-08-21 12:33:51 +02:00
Hanusz Leszek
cf39ba5801 Allow to read PNG image of color_type PNG_COLOR_TYPE_PALETTE with alpha channel 
Correct reading PNG color type palette with or without alpha imread flags -1 or 1
Better not using pnginfo.h, using png_get_tRNS instead
 2013-08-21 05:31:44 +02:00
Roman Donchenko
f76dd99299 Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	cmake/OpenCVModule.cmake
	doc/tutorials/calib3d/camera_calibration/camera_calibration.rst
	doc/tutorials/features2d/feature_detection/feature_detection.rst
	doc/tutorials/features2d/feature_flann_matcher/feature_flann_matcher.rst
	doc/tutorials/features2d/feature_homography/feature_homography.rst
	modules/core/include/opencv2/core/operations.hpp
	modules/core/src/arithm.cpp
	modules/gpu/perf/perf_video.cpp
	modules/imgproc/include/opencv2/imgproc/imgproc.hpp
	modules/java/generator/gen_java.py
	modules/java/generator/src/cpp/VideoCapture.cpp
	modules/nonfree/src/opencl/surf.cl
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/perf/perf_haar.cpp
	modules/ocl/perf/perf_precomp.hpp
	modules/ocl/src/color.cpp
	modules/ocl/src/filtering.cpp
	modules/ocl/test/test_color.cpp
	modules/ocl/test/test_objdetect.cpp
	modules/python/src2/cv2.cpp
	samples/gpu/CMakeLists.txt
	samples/gpu/super_resolution.cpp
 2013-08-19 19:02:36 +04:00
Roman Donchenko
2530b580a8 Merge branch 'master' into merge-2.4 
Conflicts:
	modules/photo/doc/inpainting.rst
 2013-08-16 14:14:12 +04:00
Roman Donchenko
47b3e7855f Merge pull request #1252 from asmorkalov:winrt_api_cert_highgui_fix 2013-08-16 14:05:39 +04:00
Roman Donchenko
46fb737bdc Merge pull request #1152 from StevenPuttemans:bugfix_2795 2013-08-16 12:52:48 +04:00
Alexander Smorkalov
9af2c1661a Restricted Win32 API was fixed in Highgui and some 3rd party libs. Patch 
for libpng added.
 2013-08-15 06:42:00 -07:00
kamjagin
69287c936b missed # in if defined 2013-08-14 14:25:46 +02:00
kamjagin
c24c1a5926 added HAVE_QTKIT to tests 2013-08-14 13:40:50 +02:00
kamjagin
7ff07e94a3 Fix for bug Bug #3215. Added HAVE_QTKIT as a separate mode from HAVE_QUICKTIME 2013-08-14 13:34:34 +02:00
abidrahmank
92d04d439e docs changes 2013-08-13 21:58:49 +05:30
Roman Donchenko
6b5ac42a9b Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	modules/calib3d/doc/camera_calibration_and_3d_reconstruction.rst
	modules/features2d/doc/common_interfaces_of_descriptor_extractors.rst
	modules/features2d/doc/object_categorization.rst
	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/imgproc/doc/miscellaneous_transformations.rst
	modules/imgproc/doc/object_detection.rst
	modules/imgproc/doc/structural_analysis_and_shape_descriptors.rst
	modules/imgproc/src/samplers.cpp
	modules/ml/doc/k_nearest_neighbors.rst
	modules/nonfree/doc/feature_detection.rst
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/photo/doc/inpainting.rst
	modules/ts/include/opencv2/ts.hpp
	platforms/scripts/camera_build.conf
	samples/android/camera-calibration/AndroidManifest.xml
 2013-08-13 12:56:39 +04:00
Roman Donchenko
dc06d47f1c Merge pull request #1241 from SpecLad:redundant-precomps 2013-08-12 17:19:53 +04:00
Roman Donchenko
504ebda7c4 Merge pull request #1235 from WonderRico:bugfix_dshow 2013-08-12 14:33:30 +04:00
WonderRico
d067749c21 fix _index / index 2013-08-12 11:19:53 +02:00
StevenPuttemans
d11746e56d Added fix mentioned in bug #3206 
VideoWriter memory leak solved.
 2013-08-12 09:49:19 +02:00
WonderRico
a048387376 fix formating 2013-08-09 16:13:40 +02:00
Roman Donchenko
d9f71b762f Deleted almost all of the precomp.cpp files. 
Looks like we don't actually use them; when creating precompiled headers
with Visual C++, a dummy .cpp is created at build time.
 2013-08-08 12:43:07 +04:00
Roman Donchenko
168e2a4ccb Removed CMake version checks that we don't need anymore. 2013-08-08 12:03:41 +04:00
StevenPuttemans
ed76b2f98f Like mentioned by Andrei Pavlenko after merging pullrequest #1206, a wrong 
ReST directive was used. Also fixed some other ReST directives that were
not correct and removed some warnings during buildbot checks.
 2013-08-07 14:49:33 +02:00
WonderRico
7e7fb0b75d Bug #3201 fix 2013-08-06 18:35:49 +02: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
Fedor Morozov
bef8d8192e Minor fixes, new MergeDebevec 2013-08-06 15:24:01 +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
Fedor Morozov
17609b90c7 Mantiuk's tonemapping 2013-08-05 19:22:42 +04:00
Andrey Pavlenko
6483754860 Merge pull request #1220 from asmorkalov:msmf_sizet_fix 2013-08-05 10:26:39 +04:00
Andrey Pavlenko
af8a03e17f Merge pull request #1222 from philippefoubert:branch_2.4_pvapi 2013-08-05 10:20:25 +04:00
Alexander Smorkalov
aada5f7844 Difference in method definition and declaration fixed (Bug #3189). 2013-08-04 22:34:36 +04:00
StevenPuttemans
f28496c628 Added sample links in documentation for python2, ocl and gpu 2013-08-02 14:05:08 +02:00
Fedor Morozov
302bf23f82 All hdr functions as Algorithms 2013-08-01 03:24:47 +04:00
Andrey Pavlenko
d138f77143 Merge pull request #1019 from jet47:opengl-documentation 2013-07-31 15:10:27 +04:00
Andrey Pavlenko
6a40067424 Merge pull request #1206 from StevenPuttemans:feature_3169 2013-07-31 14:31:21 +04:00
StevenPuttemans
4dff5b7c72 Added bugfix #2795 
- changing license header
- fixed bug in QtKit when changing camera resolution
 2013-07-31 11:25:55 +02:00
StevenPuttemans
0c5244103f Added all *.cpp samples reference to the 2.4.6 documentation as discussed in feature #3169 
- Used lunix style slashes - works on most systems
- Removed all trailing whitespaces
 2013-07-31 11:20:05 +02:00
Andrey Pavlenko
2b8d868560 Merge pull request #1098 from SeninAndrew:ximea_camera_bw_fix 2013-07-30 17:50:50 +04:00
Andrey Pavlenko
f7ce70f70a Merge pull request #1110 from SpecLad:config-cleanup 2013-07-30 17:39:35 +04:00
abidrahmank
fa1b96bd36 imshow docs improvement bug#2490 2013-07-30 07:00:51 +05:30
Frédéric Devernay
6be8757e8b fix signedness error 
OpenCV's automatic builds don't care if you store an unsigned int into
an int, but they don't want you to compare signed with unsigned. Does
that make sense?
 2013-07-26 21:32:35 +02:00
Frédéric Devernay
4ad12a680c fix cap_qtkit.mm for multithreaded applications 
cap_qtkit does not work when the capture is run outside of the main
thread.
If the capture is launched in a separate thread, then [NSRunLoop
currentRunLoop] is not the same as in the main thread, and has no timer.
see
https://developer.apple.com/library/mac/#documentation/Cocoa/Reference/F
oundation/Classes/nsrunloop_Class/Reference/Reference.html
"If no input sources or timers are attached to the run loop, this
method exits immediately"

Using usleep() (which I previously proposed, and was reverted) is not a
good alternative, because it may block the GUI.

Here is the new proposed solution:
- create a dummy timer so that runUntilDate does not exit immediately
- simplify the loop by using runUntilDate instead of runMode:beforeDate
- fix potential memory leaks (pointed out by Xcode's static analysis)
- fix init to follow Objective-C guidelines
- fax warnings about conversions from size_t to int
 2013-07-26 18:39:03 +02:00
Vladislav Vinogradov
60e2dbe810 removed ffmpeg dependency from gpucodec module: 
used implementation from highgui module
 2013-07-26 16:13:37 +04:00
Roman Donchenko
3939d78336 Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	modules/core/include/opencv2/core/types_c.h
	modules/gpu/src/cuda/imgproc.cu
	modules/gpu/src/cuda/safe_call.hpp
	modules/gpu/src/error.cpp
	modules/gpu/src/imgproc.cpp
	modules/imgproc/src/distransform.cpp
	modules/imgproc/src/shapedescr.cpp
	modules/python/src2/cv2.cpp
	modules/python/src2/cv2.cv.hpp
 2013-07-22 18:38:57 +04:00
Fedor Morozov
703cf8cef7 Calibration, various changes 2013-07-21 13:48:57 +04:00
Philippe FOUBERT
9c04db554f Rename PVAPI_DECLARATIONS to PVAPI_DEFINITIONS 2013-07-20 15:03:30 +02:00
Fedor Morozov
ec668ce3a7 Documentation 2013-07-19 00:23:49 +04:00
Alexander Shishkov
a29ce401d5 minore changes in test on HDR fromat 2013-07-18 01:32:06 +04:00
Alexander Shishkov
8ccca90dca small changes 
added including for precomp
 2013-07-18 00:28:40 +04:00
Vadim Pisarevsky
be040ff513 revert patch from PR 1074, since it break capturing on MacOSX 2013-07-16 15:02:33 +04:00
Roman Donchenko
feaa12a274 Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	modules/core/include/opencv2/core/version.hpp
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/src/initialization.cpp
	modules/ocl/test/main.cpp
	modules/superres/CMakeLists.txt
	modules/superres/src/input_array_utility.cpp
	modules/superres/src/input_array_utility.hpp
	modules/superres/src/optical_flow.cpp
 2013-07-16 11:52:41 +04:00
Roman Donchenko
1590a1a538 Merge pull request #1068 from AoD314:webp2 2013-07-15 11:45:28 +04:00
andrey.morozov
e4e0862c2e added support image with alpha channel 2013-07-13 14:09:37 +04:00
Nikita Manovich
05aeb70831 Fixed VideoCapture::open() does not release previous capture sources (Bug #3150). 
VideoCapture didn't call release method and just ignored the new capture sources.
OpenCV documentation:
  bool VideoCapture::open(const string& filename);
  bool VideoCapture::open(int device);

The methods first call VideoCapture::release() to close the already opened file or camera.
 2013-07-11 15:16:22 +04:00
Roman Donchenko
06742247be Removed unused PACKAGE_* macros. 2013-07-11 14:30:46 +04:00
Roman Donchenko
e2ef2a5781 Refactored image format library finding logic. 
Now the HAVE_* macros are set in cvconfig.h. Most of them already were there,
but were nonfunctional.
 2013-07-11 12:40:16 +04:00
Roman Donchenko
ca8b621b4f Refactored detecting several Apple-related technologies. 
Now the HAVE_* macros are set using cvconfig.h. Previously most
of them already were there, but were always undefined. One,
HAVE_COCOA, I had to add.

This also makes the CMake code more consistent; now, WITH_* variables
are always checked in cmake/*, while HAVE_* variables are checked in
modules/highgui/CMakeLists.txt.
 2013-07-10 19:45:56 +04:00
Roman Donchenko
4f9554eead Removed a few more unused configuration macros. 
I've left HAVE_LIBPTHREAD as a CMake variable, since TBB's build depends on it.

Some macros in internal.hpp depended on HAVE_ALLOCA_H, but they were, in turn,
unused, so I've just deleted them all.
 2013-07-10 18:29:11 +04:00
Nikita Manovich
21211308d0 Fixed VideoCapture::open() does not release previous capture sources (Bug #3150). 
VideoCapture didn't call release method and just ignored the new capture sources.
OpenCV documentation:
  bool VideoCapture::open(const string& filename);
  bool VideoCapture::open(int device);

The methods first call VideoCapture::release() to close the already opened file or camera.
 2013-07-10 17:48:44 +04:00
Roman Donchenko
ac39bfb4cc Remove HAVE_CVCONFIG_H - it's always defined. 2013-07-10 16:02:07 +04:00
Alexander Smorkalov
f77d1f57ee V4L and V4L2 based Video capture bug fix (Bugfix #3144). 2013-07-09 16:07:55 +04:00
Andrew Senin
aa2ca3aa8f Improve FPS on black and white Ximea cameras 2013-07-09 00:33:39 +04:00
Roman Donchenko
c05bfe9d6d Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	modules/features2d/include/opencv2/features2d/features2d.hpp
	modules/ocl/src/opencl/stereobp.cl
	modules/ocl/src/stereobp.cpp
 2013-07-08 18:47:38 +04:00
andrey.morozov
8d0452ed59 added test to save image with webp with alpha channel 2013-07-06 17:26:22 +04:00
Fedor Morozov
a5e11079d7 Fixes, missing files, tests 2013-07-04 16:51:39 +04:00
Roman Donchenko
4cf9990d4e Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	doc/tutorials/definitions/noContent.rst
	doc/tutorials/gpu/gpu-basics-similarity/gpu-basics-similarity.rst
	doc/tutorials/introduction/android_binary_package/dev_with_OCV_on_Android.rst
	doc/tutorials/introduction/how_to_write_a_tutorial/how_to_write_a_tutorial.rst
	modules/core/include/opencv2/core/core.hpp
	modules/core/include/opencv2/core/internal.hpp
	modules/core/include/opencv2/core/version.hpp
	modules/gpu/CMakeLists.txt
	modules/highgui/perf/perf_output.cpp
	modules/highgui/test/test_video_io.cpp
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/perf/main.cpp
	modules/ocl/src/hog.cpp
	modules/ocl/src/initialization.cpp
	modules/ocl/src/moments.cpp
	modules/ocl/src/opencl/moments.cl
	modules/ocl/test/main.cpp
	modules/ocl/test/test_moments.cpp
	modules/python/test/test.py
	modules/ts/include/opencv2/ts/ts_perf.hpp
	modules/ts/src/precomp.hpp
	modules/ts/src/ts_perf.cpp
 2013-07-03 19:53:21 +04:00
Philippe FOUBERT
639450efdc PvAPI support on Windows with MinGW (PR #1038 applied to the branch 2.4) 2013-07-03 00:19:22 +02:00
Frédéric Devernay
b524e275c1 allow QtKit capture in secondary threads 
[NSRunLoop currentRunLoop] is not the same as in the main thread.
see
https://developer.apple.com/library/mac/#documentation/Cocoa/Reference/F
oundation/Classes/nsrunloop_Class/Reference/Reference.html
"If no input sources or timers are attached to the run loop, this
method exits immediately"

The old code caused grabFrame() to return immediately if the capture
was not done in the main thread.
This code works correctly, even in secondary threads, provided that all
capture functions are called in the *same* thread
 2013-07-02 18:08:12 +02:00
Andrey Pavlenko
89086bdb8d Merge pull request #1046 from SpecLad:merge-2.4 2013-07-02 15:39:07 +04:00
Roman Donchenko
4b51b1e3a8 Merge pull request #1059 from dominikrose:dc1394_2-1394b 2013-06-28 14:47:45 +04:00
Roman Donchenko
1707b1769f Merge pull request #1063 from alekcac:conversion 2013-06-28 14:41:35 +04:00
Alexander Shishkov
7b06592dea added conversions between UIImage and cv::Mat 2013-06-28 13:26:54 +04:00
Kirill Kornyakov
cbed07bc18 Removed references to YG from samples 2013-06-28 12:21:52 +04:00
Dominik Rose
d39aeeca0f Merge remote-tracking branch 'remotes/upstream/2.4' into dc1394_2-1394b 2013-06-27 19:43:05 +02:00
Dominik Rose
e32700cf8f dc1394-2: support for operation mode 1394b added 2013-06-27 15:05:32 +02:00
Roman Donchenko
d76468c223 Merge pull request #1040 from asmorkalov:winrt 2013-06-27 16:59:25 +04:00
Alexander Smorkalov
7c5bd78804 Test fixes 
Calib3d badarg tests fixed. Default exception handling enabled;
Highgui Video I/O tests fixed on ARM;
Code cleanup.
 2013-06-27 15:47:37 +04:00
Alexander Smorkalov
347c86d9b5 Windows RT related code cleanup. 
Windows RT sample cleanup.
Video I/O code cleanup.
 2013-06-26 05:44:10 -07:00
Roman Donchenko
f36f8067bc Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	modules/calib3d/include/opencv2/calib3d/calib3d.hpp
	modules/core/include/opencv2/core/core.hpp
	modules/core/include/opencv2/core/cuda/limits.hpp
	modules/core/include/opencv2/core/internal.hpp
	modules/core/src/matrix.cpp
	modules/nonfree/test/test_features2d.cpp
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/src/hog.cpp
	modules/ocl/test/test_haar.cpp
	modules/ocl/test/test_objdetect.cpp
	modules/ocl/test/test_pyrup.cpp
	modules/ts/src/precomp.hpp
	samples/ocl/facedetect.cpp
	samples/ocl/hog.cpp
	samples/ocl/pyrlk_optical_flow.cpp
	samples/ocl/surf_matcher.cpp
 2013-06-25 15:55:52 +04:00
Alexander Smorkalov
34c6598752 Perf test failure fixes for Media Foundation. 2013-06-25 03:35:57 -07:00
Alexander Smorkalov
2bc1d3709c GetProperty method for MSMF VideoCapture implemented. 2013-06-25 03:35:56 -07:00