1
0
mirror of https://github.com/opencv/opencv.git synced 2026-07-29 23:33:05 +04:00
Commit Graph

11058 Commits

Author SHA1 Message Date
Alexander Alekhin aae7621243 highgui(macos): fix video file reading via AVFoundation 2017-06-24 11:01:33 +03:00
Alexander Alekhin fa36e769cf Merge pull request #8979 from sabzo:issue/8305_unhandled_objective_c_exception_video_avi_playback
Unhandled Objective-C exception when playing video
2017-06-24 10:56:25 +03:00
Sabelo f71bf21aaf Unhandled Objective-C exception when playing video 2017-06-23 19:54:56 -04:00
Alexander Alekhin e397794ae2 Merge pull request #8959 from alalek:gitignore_cache_2.4 2017-06-22 12:29:23 +03:00
Alexander Alekhin 3d4e1bd641 .gitignore: add .cache directory (to be consistent with master branch) 2017-06-21 19:25:36 +03:00
Alexander Alekhin 3649ee3cd3 Merge pull request #8887 from krishraghuram:gpu_reduce_doc
Modified doc for gpu::reduce(fixes issue 8628)
2017-06-10 22:27:17 +02:00
Raghuram Krishnaswami d0f3a14456 Modified doc for gpu::reduce(fixes issue 8628) 2017-06-10 18:36:39 +05:30
krishraghuram 01e34b6a91 correct bug in fastmeans (ref #7899) (#8757) 2017-05-23 12:40:49 +03:00
Alexander Alekhin df5c090f2e Merge pull request #8761 from kvaghel1:Issue-8760
Correct findChessboardCorners flags naming in calib3d doc. (#8761)
2017-05-22 16:46:59 +03:00
kvaghel1 27213a845f Correct findChessboardCorners flags naming in calib3d doc. 2017-05-21 21:12:19 -04:00
Alexander Alekhin 91a6940930 Merge pull request #8574 from elmewo:fix-affine-constructor
fix creation homogeneous affine matrix when constructing from 4x3 cv::Mat
2017-04-25 19:04:51 +03:00
Alexander Alekhin 7577f1420d Merge pull request #8592 from tomoaki0705:fixTypoCalib3d24
calib3d: fix typo
2017-04-17 17:22:29 +03:00
Tomoaki Teshima c72a191145 fix typo 2017-04-17 22:13:10 +09:00
André Mewes 34d7b96bfc create homogeneous affine matrix when constructing from 4x3 cv::Mat 2017-04-13 14:39:10 +02:00
Alexander Alekhin 160f26192c Merge pull request #8562 from alalek:fix_ffmpeg_check_2.4
(2.4) ffmpeg: add __STDC_CONSTANT_MACROS to check code
2017-04-11 16:27:25 +03:00
Alexander Alekhin 9e76ba5ccd ffmpeg: add __STDC_CONSTANT_MACROS to check code 2017-04-11 12:45:10 +03:00
Alexander Alekhin ec784331fb Merge pull request #8353 from lpetre:backport_3593
backport of PR #3593
2017-03-13 10:01:07 +00:00
Adam Borowski 61936eb1a4 Get rid of sysctl includes on Linux.
The 'sysctl' syscall has been strongly deprecated on Linux for ages.
Currently, on old architectures it will spam syslog whenever used, and on
newer ones it's missing from the headers altogether.  Opencv has migrated
away on Linux already, but #includes were left lingering.  This commit
removes them on non-__APPLE__, unbreaking x32 (and probably others).
2017-03-10 16:40:29 +00:00
Alexander Alekhin d856604a4a Merge pull request #8322 from StevenPuttemans:backport_8207
backport of PR #8207
2017-03-06 16:07:27 +00:00
StevenPuttemans ab806b63a7 backport of PR #8207 2017-03-06 14:03:26 +01:00
Alexander Alekhin 0051744fa0 Merge pull request #8267 from umbraclet16:fixCalibSample
Solve issue #8264
2017-02-28 11:47:37 +00:00
umbraclet16 b8d99e1ffb Solve issue #8264
Fix bug in camera_calibration.cpp that the program tries to
parse input of type VIDEO_FILE as IMAGE_LIST which causes the
program to crash.
2017-02-25 16:16:23 +08:00
Alexander Alekhin 54f65a4672 Merge pull request #8002 from alalek:c_defines_2.4
(2.4) cmake: add defines to enable useful macroses
2017-02-14 19:09:17 +03:00
Alexander Alekhin d103c116db Merge pull request #8031 from terfendail:shortline_fix_2.4
Backport of PR #7161 fix for drawing beyond 32768 range
2017-02-14 19:08:09 +03:00
Alexander Alekhin e304795622 cmake: add defines to enable useful macroses 2017-02-13 15:01:23 +03:00
Alexander Alekhin ebae963884 drawing: workaround MSVC2010 32-bit compiler bug 2017-02-02 21:01:28 +03:00
Vadim Pisarevsky 19e4c7727b Merge pull request #7546 from savuor:fix2.4/yuv_channel_order 2017-01-31 16:12:12 +00:00
Alexander Alekhin f2a59b3d94 Merge pull request #7913 from DabeDotCom:CoreImage-pre_Xcode_7 2017-01-19 16:18:40 +00:00
Dabrien 'Dabe' Murphy 88bc0f7838 Fix 7606 "ld: framework not found CoreImage" Bug
This affects OpenCV 2.4 on older Macs with Xcode versions
before 7.0 (i.e., Mac OS X versions older than 10.11 El Capitan)
2017-01-19 17:07:01 +03:00
Vitaly Tuzov 2346ba7ea2 Backport of PR #7161 fix for drawing beyond 32768 range 2017-01-18 17:02:52 +03:00
parismita f5db748312 Update linux_install.rst (#7776)
* Update linux_install.rst

whitespace between -D and \<option\> removed

* Update linux_install.rst

* Update linux_install.rst

* Update linux_install.rst

* Update linux_install.rst

* Update linux_install.rst

* Update linux_install.rst

* Update linux_install.rst

* Update linux_install.rst

* Update linux_install.rst
2017-01-10 15:13:41 +03:00
Alexander Alekhin 3e66654963 Merge pull request #7973 from sturkmen72:patch-2 2017-01-06 11:07:23 +00:00
Suleyman TURKMEN f108795e2c Update sift.cpp 2017-01-05 19:47:34 +02:00
Alexander Alekhin 6ed571b3c6 Merge pull request #7893 from alalek:fix_ffmpeg_check_2.4 2016-12-19 14:32:42 +00:00
Alexander Alekhin 9d45f15627 cmake: fix ffmpeg check code 2016-12-19 00:22:16 +03:00
Alexander Alekhin d7504ecaed OpenCV version++ 2.4.13.2 2016-12-16 16:19:56 +03:00
Alexander Alekhin c7ae26bf24 Merge pull request #7879 from alalek:backport_7852 2016-12-16 13:19:58 +00:00
Rostislav Vasilikhin 8444c23803 fixed segfault at ORB::compute() near image's border 2016-12-16 14:55:15 +03:00
Alexander Alekhin 22df206e1f Merge pull request #7875 from alalek:winpack_fix_2.4
cmake: update PDB support condition
2016-12-15 18:47:41 +02:00
Alexander Alekhin b06bd50144 cmake: update PDB support condition
Unfortunately there is no stable support for installation of PDB files in CMake.
This patch is just eliminate problems with modern versions.
2016-12-15 19:13:44 +03:00
Alexander Alekhin cc09f5a7de Merge pull request #7854 from alalek:backports_2016
(2.4) Backports from master branch (#7854)
2016-12-15 18:09:44 +02:00
Alexander Alekhin 49e6bb2993 Merge pull request #7868 from alalek:icc_2.4
(2.4) Build with ICC
2016-12-15 18:09:17 +02:00
Alexander Alekhin 667cb2e9fc Merge pull request #7867 from alalek:cuda_warnings_2.4
(2.4) Fix CUDA warnings
2016-12-15 18:09:12 +02:00
Alexander Alekhin 041502e42c build: eliminate ICC warnings 2016-12-15 16:03:15 +03:00
Alexander Alekhin d206e84a13 cmake: use -fp-model precise with ICC 2016-12-15 15:50:30 +03:00
Alexander Alekhin 03beff06ff build: disable warnings (Ubuntu 16.04 + CUDA 8.0)
Examples:
- NPP_staging.cu:1606:105: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing]
- NCVHaarObjectDetection.hpp:95:37: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing]
2016-12-15 15:47:41 +03:00
Alexander Alekhin 7db13c7aab Merge pull request #7847 from alalek:install_docs_target_2.4 2016-12-14 11:01:57 +00:00
Alexander Alekhin af0ee306cf Merge pull request #7819 from alalek:fix_mulSpectrums_inplace_2.4 2016-12-14 11:00:54 +00:00
Alexander Alekhin 7241b90dec cmake: special target to build/install docs only 2016-12-13 20:13:06 +03:00
bedbad ffcf866e2f Merge pull request #7754 from LAZI-2240:toupstream2.4
Introducing boundingRect2f() (#7754)

* Introducing boundingRect2f to return exact bounding float rectangle for RotatedRect

* Introducing boundingRect2f to return exact bounding float rectangle for RotatedRect

* Introducing boundingRect2f() - update

* Introducing boundingRect2f to return exact bounding float rectangle for RotatedRect

* Introducing boundingRect2f() - update - tested
2016-12-12 21:29:53 +02:00