Vadim Pisarevsky
48b747903b
Merge pull request #6830 from tomoaki0705:featureSupportFp16
2016-07-18 15:56:00 +00:00
Vadim Pisarevsky
d62b0bd363
Merge pull request #6849 from alcinos:optflow_interface
2016-07-18 15:05:13 +00:00
Alexander Alekhin
55d0945149
Merge pull request #6932 from philippefoubert:bugfix_issue_6931
2016-07-18 13:23:56 +00:00
Maksim Shabunin
070f0f8445
Merge pull request #6936 from catree:fix_NAryMatIterator_code_example
2016-07-18 08:38:49 +00:00
Maksim Shabunin
474868a892
Merge pull request #6884 from alalek:migration
2016-07-18 07:49:38 +00:00
catree
7f64f31f66
Fix NAryMatIterator code example.
2016-07-17 23:21:15 +02:00
Philippe FOUBERT
d9a56f6590
Resolves issue #6931
2016-07-17 12:22:37 +02:00
Ilya Lavrenov
957bf1452c
added some tests for push_back
2016-07-15 14:48:22 +03:00
Maksim Shabunin
b0fa477614
Merge pull request #6908 from ilya-lavrenov:reduce
2016-07-15 09:07:56 +00:00
Maksim Shabunin
154d61edf9
Merge pull request #6907 from ilya-lavrenov:typo
2016-07-15 09:07:19 +00:00
Maksim Shabunin
b542914057
Merge pull request #6904 from ilya-lavrenov:minmaxloc
2016-07-15 09:06:15 +00:00
Maksim Shabunin
f695d4f04b
Merge pull request #6903 from jet47:cuda-stream-thread-safety-notes
2016-07-14 14:29:08 +00:00
Ilya Lavrenov
0af3947468
added note about cv::reduce output type for MIN/MAX
2016-07-14 17:22:08 +03:00
Ilya Lavrenov
c634e39299
removed extra semicolon
2016-07-14 15:50:35 +03:00
Ilya Lavrenov
c4b57d0ded
disable ippiMinMaxIndx_32f_C1R usage since it crashes on Nans
2016-07-14 14:52:58 +03:00
Maksim Shabunin
a00f0c44ae
Merge pull request #6821 from sturkmen72:TickMeter_class_addition
2016-07-14 11:40:46 +00:00
Vladislav Vinogradov
bfd6ae77f5
Add note that cv::cuda::Stream class is not thread safe
2016-07-14 14:20:37 +03:00
Alexander Alekhin
e871045b46
Merge pull request #6896 from jet47:cuda-arch-update
2016-07-13 12:26:52 +00:00
Alexander Alekhin
53f4eaa7a7
Merge pull request #6892 from ioxp:fsSpace
2016-07-13 11:46:50 +00:00
Vladislav Vinogradov
112903c2bd
increase minimal supported CUDA toolkit to 6.5
2016-07-13 13:02:13 +03:00
Alexander Alekhin
ddc0b42bc3
migration: github.com/opencv/opencv
2016-07-12 12:51:12 +03:00
Alexander Alekhin
a6b33c3590
Merge pull request #6846 from mbarnach:6086-cuda-initialization
2016-07-11 14:01:51 +00:00
Alexander Alekhin
7176c1327e
Merge pull request #6850 from alalek:bigdata_test
2016-07-11 14:01:06 +00:00
Alexander Alekhin
9b3d65c5e4
Merge pull request #6867 from alalek:fix_lapack
2016-07-11 14:00:22 +00:00
Alexander Alekhin
c8693f01a3
Merge pull request #6792 from paroj:jaccard_distance
2016-07-11 09:57:20 +00:00
Alexander Alekhin
5f269d08b4
bigdata: add test, resolve split/merge issue
2016-07-08 18:05:53 +03:00
Philipp Hasper
00112bbe10
persistence: fixing crash with space-only values
2016-07-08 12:41:05 +02:00
Vladislav Sovrasov
a2ec23c112
Update cv::log documentation
2016-07-05 17:28:53 +03:00
Alexander Alekhin
96919156e7
Merge pull request #6761 from alalek:fix_warnings
2016-07-04 09:52:03 +00:00
Alexander Alekhin
3844ee780c
build: fix compiler warnings (GCC 5.3.1)
2016-07-01 20:17:16 +03:00
Alexander Alekhin
7dc5332a92
Merge pull request #6745 from alalek:viz_samples
2016-07-01 15:27:01 +00:00
Alexander Alekhin
b23527bf02
core: fix arguments types for cblas calls
2016-06-30 20:25:08 +03:00
Vadim Pisarevsky
7fea7e0629
Merge pull request #6697 from wiryls:FileStorageBase64
2016-06-30 17:17:03 +00:00
Alexander Alekhin
8184535de1
samples: repair viz tutorial
2016-06-30 17:21:31 +03:00
Vitaliy Lyudvichenko
930d96f684
Fixing of AutoBuffer::allocate(nsz) method
...
AutoBuffer::allocate(nsz) didn't work properly when
(sz < nsz < fixed_size). In this case sz remained unchanged.
2016-06-29 19:50:51 +03:00
MYLS
df5a7c8ee9
build again for OpenCL.
...
I could not find the cause of the error:
```
C:\builds_ocv\precommit_opencl\opencv\modules\ts\src\ts_perf.cpp(361):
error: The difference between expect_max and actual_max is
8445966.0000002384, which exceeds eps, where
expect_max evaluates to 0.9999997615814209,
actual_max evaluates to 8445967, and
eps evaluates to 1.0000000000000001e-005.
Argument "dst0" has unexpected maximal value
```
Hope this is a false alarm.
2016-06-25 02:24:33 +08:00
MYLS
677d4d20ce
fixed an error in the test...
2016-06-25 00:37:13 +08:00
MYLS
959002fb96
solve warnings and errors in test.
2016-06-24 23:41:40 +08:00
MYLS
7c92ee2e6e
Split cvWriteRawData_Base64
into three functions
...
The three new functions:
```cpp
void cvStartWriteRawData_Base64(::CvFileStorage * fs, const char* name,
int len, const char* dt);
void cvWriteRawData_Base64(::CvFileStorage *
fs, const void* _data, int len);
void
cvEndWriteRawData_Base64(::CvFileStorage * fs);
```
Test is also updated. (And it's remarkable that there is a bug in
`cvWriteReadData`.)
2016-06-24 22:27:42 +08:00
Suleyman TURKMEN
d2bad6febb
cv::TickMeter class addition
2016-06-23 19:06:57 +03:00
Alexander Alekhin
09c2a8b7ad
cmake: fix HAL dependencies for core module
...
Linker dependencies are transitive for non-private
2016-06-21 19:50:32 +03:00
MYLS
29921d055d
change the parameter to CvMat
and CvMatND
...
```cpp
cvWriteMat_Base64(::cv::FileStorage & fs, ::cv::String const & name,
::cv::Mat const & mat)
```
becomes:
```cpp
CV_EXPORTS void cvWriteMat_Base64(::CvFileStorage* fs, const char* name,
const ::CvMat* mat);
CV_EXPORTS void
cvWriteMatND_Base64(::CvFileStorage* fs, const char* name, const
::CvMatND* mat);
```
2016-06-20 16:59:58 +08:00
MYLS
9faa2a7fd0
solve warning for IOS
...
Two test are still needed:
1. Verify the Base64 data.
2. Read an old YML file for compatibility test.
2016-06-19 02:44:39 +08:00
MYLS
958263d245
Solve warnings, and adjusted the test case.
2016-06-19 02:00:32 +08:00
MYLS
882e4221e7
fix errors from test.
...
Two other test are still needed.
1. Verify the Base64 data.
2. Read an old YML file for compatibility test.
2016-06-19 00:45:51 +08:00
MYLS
d1b097f409
fix most coding style warnings and errors
2016-06-18 23:28:12 +08:00
MYLS
7b1f7c8d8e
Add Base64 support for FileStorage
...
1. Add Base64 support for reading and writing XML\YML file.
The two new functions for writing:
```cpp
void cvWriteRawData_Base64(cv::FileStorage & fs, const void* _data, int
len, const char* dt);
void cvWriteMat_Base64(cv::FileStorage & fs, cv::String const & name,
cv::Mat const & mat);
```
2. Change YML file header form `YAML:1.0` to `YAML 1.0`. (standard
format)
3. Add test for Base64 part.
2016-06-18 22:14:11 +08:00
MYLS
ecd827fc8e
Add Base64 support for FileStorage
...
[GSoC] FileStorage:
Add base64 support for reading and writting XML\YML file.
The two new functions:
```
void cvWriteRawData_Base64(cv::FileStorage & fs, const void* _data, int
len, const char* dt);
void cvWriteMat_Base64(cv::FileStorage & fs, cv::String const & name,
cv::Mat const & mat);
```
2016-06-18 21:40:29 +08:00
Alexander Alekhin
31952fbf1c
Merge pull request #6675 from pnordhus:matconstiterator_reference
2016-06-17 10:12:51 +00:00
Vadim Pisarevsky
547a2d29c3
Merge pull request #6535 from sovrasov:lapack-hal
2016-06-16 20:09:47 +00:00
Alexander Alekhin
f4ebc504d1
cmake: refactor HAL attaching process
2016-06-15 17:34:30 +03:00
Philipp Nordhus
4a529cd641
Return reference on iterator indirection/subscript
2016-06-11 15:17:52 +02:00
Tomoaki Teshima
87d0c91dcf
fix warning of build
2016-06-09 18:24:00 +09:00
Tomoaki Teshima
d0a8390963
fix run time error on Mac
...
* integrate HW version and SW version to same function
2016-06-09 08:41:37 +09:00
Alexander Alekhin
1b6e02793c
Merge pull request #6645 from tomoaki0705:fixTypoEigen
2016-06-07 13:51:30 +00:00
Tomoaki Teshima
fd76ed5c0f
fix to support wider compiler
...
* check compiler more strictly
* use gcc version of fp16 conversion if it's possible (gcc 4.7 and later)
* use current SW implementation in other cases
2016-06-07 18:32:47 +09:00
Tomoaki Teshima
6f6eebbcb9
fix warning
2016-06-07 18:31:18 +09:00
Vladislav Sovrasov
055f5c7395
Change names of some internal functions
2016-06-07 10:58:12 +03:00
Tomoaki Teshima
d1c1c01761
fix typo
2016-06-07 14:53:04 +09:00
Tomoaki Teshima
fbfd3158a7
fix corner case when number is small
2016-06-07 08:59:28 +09:00
Maksim Shabunin
532885c12b
Merge pull request #6607 from alalek:issue_6604
2016-06-06 09:20:58 +00:00
Tomoaki Teshima
4239bac4ed
fix warning of doc
...
* update the comment to real header
2016-06-06 18:06:23 +09:00
Tomoaki Teshima
eccf2fa4c3
follow other interface
...
* remove useHW option
* update test
2016-06-06 08:56:37 +09:00
Vladislav Sovrasov
a2d0cc878c
Implement internal HAL for GEMM and matrix decompositions
2016-06-03 10:38:30 +03:00
Alexander Alekhin
e1ba4399e8
Merge pull request #6611 from tomoaki0705:fixPerformanceSplitAarch64
2016-06-01 10:34:33 +00:00
Tomoaki Teshima
070e4d754e
let the performance test of split pass on 64bit ARM
...
* loosen the threshold only under aarch64
* fix #6610
2016-05-31 23:57:49 +09:00
Alexander Alekhin
d3930cdee1
Merge pull request #6482 from paroj:filestorage_py
2016-05-31 11:53:34 +00:00
Vadim Pisarevsky
40686415f9
Merge pull request #6593 from bramton:documentation-update
2016-05-31 10:32:18 +00:00
Alexander Alekhin
ff0601cda5
core: prevent changes in 'std' namespace
2016-05-31 13:02:15 +03:00
Alexander Alekhin
f6fa1cee2b
Merge pull request #6008 from amroamroamro:fix_sparse_snippet
2016-05-31 08:19:38 +00:00
Bram Ton
dfd5191e8b
Minor additions to the documentation.
2016-05-26 16:35:20 +02:00
Maksim Shabunin
cbf2b79e1f
Fixed documentation warnings produced by updated doxygen
2016-05-25 18:04:32 +03:00
Pavel Rojtberg
bf688da50b
FileStorage: add simplified API for bindings
...
at least it is possible to read/ write calibration files. Fixes #4282 .
Also add CPP method for writing comments.
2016-05-25 16:01:55 +02:00
Maksim Shabunin
64a5126ff8
Merge pull request #6018 from sturkmen72:patch-2
2016-05-23 11:57:26 +00:00
Maksim Shabunin
c393a7a98f
Merge pull request #6564 from jlguardi:ml_load_empty_ptr
2016-05-23 08:41:05 +00:00
Tomoaki Teshima
b2ad7cd9c0
add feature to convert FP32(float) to FP16(half)
...
* check compiler support
* check HW support before executing
* add test doing round trip conversion from / to FP32
* treat array correctly if size is not multiple of 4
* add declaration to prevent warning
* make it possible to enable fp16 on 32bit ARM
* let the conversion possible on non-supported HW, too.
* add test using both HW and SW implementation
2016-05-21 21:31:33 +09:00
Suleyman TURKMEN
c6e6d4c822
Update pca.cpp
2016-05-21 14:23:45 +03:00
Jose Luis Guardiola
a812989436
Fixed #6563 : Incorrect management for invalid files/filestorage/filenode in ml module
2016-05-20 13:18:02 +02:00
Tomoaki Teshima
bfcb40ad77
fix Core_MulSpectrum test on 64bit ARM + release mode
...
* fix issue #6536
* increase threshold in particular tests due to the difference of fmsub and fsub
2016-05-20 18:25:32 +09:00
Tomoaki Teshima
7077d1de63
fix hal_intrin test on 64bit ARM
...
* fix issue 6521
* use correct comparison
2016-05-12 18:30:09 +09:00
Julien Nabet
a29c814bd8
cppcheck: fix some reports
...
All of these: (performance) Prefer prefix ++/-- operators for non-primitive types.
[modules/calib3d/src/fundam.cpp:1049] -> [modules/calib3d/src/fundam.cpp:1049]: (style) Same expression on both sides of '&&'.
2016-04-29 15:41:39 +02:00
Vadim Pisarevsky
df6eb101e1
Merge pull request #6467 from ohnozzy:Doc-for-ocl-Kernel-Run
2016-04-25 13:07:34 +00:00
Vadim Pisarevsky
904381c602
Merge pull request #6020 from mshabunin:hal_dxt
2016-04-25 11:37:18 +00:00
ohnozzy
d66ed313cb
Add Comment
...
Add documentation for Kernel::run
2016-04-25 11:30:12 +08:00
Maksim Shabunin
ec63343f34
Merge pull request #6420 from ioxp:foreachDoc
2016-04-20 11:55:03 +00:00
Maksim Shabunin
5a938309c1
More compilation warnings fixed
2016-04-19 16:08:48 +03:00
Maksim Shabunin
11378fcb17
Fixed compiation problems
2016-04-19 14:50:07 +03:00
Maksim Shabunin
5e9192287d
Added HAL cvtColor interface
2016-04-18 16:34:25 +03:00
Alexander Alekhin
96937bac74
Merge pull request #6581 from mshabunin:hal_mag
2016-06-21 13:16:17 +00:00
Maksim Shabunin
1e667de1f3
HAL math interfaces: fastAtan2, magnitude, sqrt, invSqrt, log, exp
2016-05-31 11:54:52 +03:00
Philipp Hasper
c52759432d
Fixing doc for cv::Mat::forEach
...
image.forEachWithPosition does not exist
2016-04-18 13:51:07 +02:00
Dan
e9461d3feb
templated std::vector<T> constructor was being called instead of const std::vector<cv::cuda::GpuMat>.
2016-04-14 15:50:24 -04:00
Maksim Shabunin
fc9f7cc925
Merge pull request #6375 from ohnozzy:Bug-Fix-for-Issue-6288
2016-04-13 07:51:33 +00:00
ohnozzy
9dd962ca1a
Bug Fix for Issue 6288
...
Added 2 inline functions in persistence.hpp
So that the '>>' operator works correctly for std::Vector<KeyPoint> and
std::Vector<DMatch>
2016-04-12 21:40:50 +08:00
Maksim Shabunin
1307bb1d03
Merge pull request #6314 from mvukad:bugfix_dtreeswrite
2016-04-12 13:26:25 +00:00
Philipp Hasper
47c4ee974a
operator<< handles keys starting with underscore
2016-04-11 09:55:33 +02:00
Maksim Shabunin
233612efd7
Reworked HAL dft/dct interface, added replacement documentation
2016-04-08 16:03:51 +03:00
Maksim Shabunin
f40d701427
DFT: renamed HAL functions
2016-04-08 11:19:28 +03:00
Maksim Shabunin
008abd28fd
Extracted HAL interfaces for DFT/DCT, added new test
2016-04-08 11:19:28 +03:00
mvukad
695e33b25b
Fix missing format when writing Algorithm-based objects
...
Added a writeFormat() method to Algorithm which must be called by the
write() method of derived classes.
2016-04-07 13:49:42 -07:00
Maksim Shabunin
5877debb6f
HAL resize, warpAffine, warpPerspective interface
...
- added HAL documentation support
- added documentation to HAL replacement interface
- updated several HAL functions in imgproc module
2016-04-07 18:47:24 +03:00
Vladislav Sovrasov
72ed4173df
Change setRNGSeed implementaion
2016-03-29 10:54:42 +03:00
Vladislav Sovrasov
362d52a3cb
Fix doxygen warnings
2016-03-25 16:34:45 +03:00
Vladislav Sovrasov
a490b64e9b
Add function setRNGSeed and seed setup in python tests
2016-03-25 16:17:58 +03:00
Maksim Shabunin
83379695a0
HAL interface for morphology operations
2016-03-21 09:32:06 +03:00
Robbert Klarenbeek
dd510e1de9
Fix incompatibility with some C++11 implementations
2016-03-15 17:21:05 +01:00
Dan
42c36c0c80
Linux bug fix for ThrustAllocator.
2016-03-14 11:09:52 -04:00
Alexander Alekhin
7783206934
Merge pull request #6259 from polevoy-d-v:move_sematics_fix
2016-03-14 14:46:21 +00:00
Прун Виктор
a90a576d76
fixed incorrect behaviour of move semantics for cv::Ptr, cv::Mat, cv::UMat in case when rvalue-reference references to *this.
2016-03-14 16:10:23 +03:00
Suleyman TURKMEN
826b5a2ef1
Update lda.cpp
...
typo correction
2016-03-13 21:11:34 +02:00
Vadim Pisarevsky
c9db05de22
Merge pull request #6137 from dtmoodie:thrust_allocator
2016-03-12 17:07:03 +00:00
Piotr Semenov
108ddc199a
Fix that corrects the OpenCV's random access iterator distance: d(x,y) = -d(y,x)
2016-03-10 11:58:32 +03:00
aravind
dccbf50059
Fixed VS 2010 and option Za bug.
2016-03-03 18:01:05 +05:30
Maksim Shabunin
3cc234588a
Added build warnings in case of macro definition conflicts
2016-02-25 11:51:02 +03:00
Dan
95608b1b84
free -> deallocate
2016-02-18 15:05:13 -05:00
Dan
c0e34934c8
Merge branch 'thrust_allocator' of https://github.com/dtmoodie/opencv
2016-02-18 00:43:18 -05:00
Dan
da93a5527d
Thrust allocator for temporary storage used with thrust algorithms.
2016-02-18 00:23:20 -05:00
Alexander Alekhin
8c591ebd77
Merge pull request #6060 from alalek:fix_opencl_opengl_sharing_6052
2016-02-16 07:10:02 +00:00
Alexander Alekhin
f48cda2f95
test: initialize test data in test_umat.cpp (6102)
2016-02-12 13:15:15 +03:00
Alexander Alekhin
c7bdbef504
ocl: fix OpenGL sharing detection (6052)
...
Apple OpenCL framework hasn't OpenGL sharing extension
2016-02-11 12:46:22 +03:00
Alexander Alekhin
87bbaa2c27
ocl: OpenCL headers are located in "CL" subfolder (3rdparty/include)
2016-02-11 12:44:45 +03:00
Mathieu Barnachon
6a0d3b3e42
Called after setDevice.
...
Wrap in a cudaSafeCall.
2016-02-09 14:40:09 +01:00
Steven Puttemans
cd96df1407
Update mat.hpp
2016-02-08 13:26:06 +01:00
Mathieu Barnachon
b030ac0433
Ensure the Cuda context is initialized correctly as long as the setDevice is not called in a multi-thread environment.
2016-02-08 13:17:08 +01:00
Steven Puttemans
a70c54f2c5
Added suggestions from PR6068
...
As discussed here: https://github.com/Itseez/opencv/pull/6068#issuecomment-180797723
2016-02-08 10:20:08 +01:00
StevenPuttemans
873399705d
add clarification on the acces paramter of the at operator
2016-02-05 13:21:40 +01:00
Alexander Alekhin
b2d44663fd
Merge pull request #6058 from sturkmen72:documentation_fix_cv_repeate
2016-02-04 15:14:02 +00:00
Vadim Pisarevsky
56c89e0a98
Merge pull request #6014 from alalek:fix_5991
2016-02-04 09:54:27 +00:00
Suleyman TURKMEN
194b865daf
update documentation of cv::repeat
2016-02-03 23:36:30 +02:00
Alexander Alekhin
7e472fbf68
ocl: thread-safe OpenCL loading (6056)
2016-02-03 18:30:40 +03:00
alcinos
6e3b90de9b
Add static creator for TVL1 optical flow class
2016-01-28 20:03:28 +01:00
Alexander Alekhin
2978a16c85
core: preserve sizes values ( fixes #5991 )
...
_sizes can point to internal structure which is destroyed
by release() call
2016-01-26 14:11:53 +03:00
Alexander Alekhin
96f5a930f4
test: regression 5991
2016-01-26 14:11:53 +03:00
Amro
c35b00a97e
fix code snippet showing how to use SparseMat
...
generate indices within the size limit (modulo)
2016-01-23 17:28:49 +02:00
Alexander Alekhin
c35ddcba1a
cmake: refactor OpenCL detection, allow custom configurations
2016-01-15 13:05:16 +03:00
Alexander Alekhin
c7ccde69a8
fix TLS implementation ( closes #5967 )
2016-01-14 14:38:37 +03:00
takacsd
1e0928633d
Add missing implementation to one of the Mat_<_Tp> constructor. ( #5945 )
2016-01-11 16:11:50 +01:00
Alexander Alekhin
a8b27ae303
Merge pull request #5910 from rokm:cuda-warnings
2016-01-11 11:11:27 +00:00
Alexander Alekhin
76c9714516
Merge pull request #5883 from alalek:fix_5876
2016-01-04 05:28:41 +00:00
Rok Mandeljc
029dfbc89d
opencv_core: CUDA: check if __CUDA_ARCH__ is defined before comparing it
...
Changed statements of type "#if __CUDA_ARCH__ >= 200" to
"#if defined __CUDA_ARCH__ && __CUDA_ARCH__ >= 200" in order to
avoid warnings about __CUDA_ARCH__ being undefined.
2016-01-01 23:48:57 +01:00
Alexander Alekhin
17e4d33b0e
added regression test for #5876
2015-12-25 16:16:34 +03:00
Pavel Rojtberg
4db6d9986d
also port Rodrigues in Affine to Matx expressions
...
so results are numerically equivalent
2015-12-25 13:47:10 +01:00
Alexander Alekhin
6997d423c8
fix normalize in case of inplace operations
...
fixes #5876
2015-12-25 15:33:06 +03:00
Pavel Rojtberg
b3bbe7704d
add jaccardDistance measure for rectangle overlap
...
computes the complement of the Jaccard Index as described in
https://en.wikipedia.org/wiki/Jaccard_index . For rectangles this reduces
to computing the intersection over the union.
2015-12-23 13:12:45 +01:00
Alexander Alekhin
afdbd855ee
Merge pull request #5843 from jia-kai:disable-dlopen-opencl
2015-12-21 15:47:15 +00:00
Alexander Alekhin
4cfe2b4dea
Merge tag '3.1.0'
...
OpenCV 3.1.0
2015-12-21 14:24:46 +03:00
jiakai
22599a2812
define g_haveOpenCL only when HAVE_OPENCL is set
2015-12-21 16:42:38 +08:00
jiakai
387214a3c5
do not open libopencl by dlopen if HAVE_OPENCL is not set
2015-12-21 12:04:00 +08:00
Alexander Alekhin
94e4498cfd
Version for 3.1.0 release
2015-12-18 16:08:05 +03:00
Alexander Alekhin
323e24e3ef
change links from samples/python2 to samples/python
2015-12-18 11:00:30 +03:00
Vadim Pisarevsky
d02627ea89
Merge pull request #5825 from GregoryMorse:master
2015-12-18 07:17:29 +00:00
Gregory Morse
af5bec70cd
merge Win10/VS2015 changes
2015-12-17 21:15:59 +01:00
Vadim Pisarevsky
9aeb8c8d5a
Merge pull request #5810 from mshabunin:hal_interface
2015-12-17 16:48:02 +00:00
Maksim Shabunin
84f37d352f
HAL moved back to core
2015-12-17 12:33:23 +03:00
Alexander Alekhin
6f2632ca2e
ocl: fix buffer pool small allocations issue ( fixes #5815 )
2015-12-16 14:31:26 +03:00
Vadim Pisarevsky
b2bb7d075a
Merge pull request #5781 from jet47:fix-cuda-createContinuous
2015-12-16 10:37:56 +00:00
Maksim Shabunin
574280cd3a
Merge pull request #5784 from alalek:distrib_fix
2015-12-15 12:24:36 +00:00
Vadim Pisarevsky
34129d8e83
Merge pull request #5806 from IshankGulati:cv-merge-documentation
2015-12-15 10:16:21 +00:00
Ishank gulati
d1ac75cabd
corrected cv::merge documentation
2015-12-15 11:02:08 +05:30
Thomas Dunker
6882c10b45
Extension of the camera distortion model for tilted image sensors (Scheimpflug condition) including test
2015-12-14 15:20:34 +01:00
Alexander Alekhin
1836d41b5c
warning fix (MSVS2015)
2015-12-12 15:23:31 +03:00
Vadim Pisarevsky
d2e169929c
Merge pull request #5767 from dtmoodie:cpu_mat_memory_allocator
2015-12-10 14:32:04 +00:00
Vladislav Vinogradov
5576c0866a
fix #5780 : cv::cuda::createContinuous
effectively ignores its cols
argument
2015-12-10 14:20:28 +03:00
Alexander Alekhin
b26580cc7b
checkRange fixes
...
1) fix multichannel support
2) remove useless bad_value, read value from original Mat directly
3) add more tests
4) fix docs for cvCeil and checkRange
2015-12-09 18:31:27 +03:00
Gregory Morse
bcf78daed2
Update CMakeLists.txt
...
WinRT parallels library is causing conflicts in VC++ due to inconsistent usage with C++/CX which is now present in parallels.cpp. This support should be included in all projects with WinRT specific code except if doing special native C++ tasks.
2015-12-09 03:45:10 +01:00
Vadim Pisarevsky
d6f8a75e91
Merge pull request #5230 from PhilLab:patch-4
2015-12-08 18:46:34 +00:00
Dan
237f33d4f0
nullptr -> NULL
2015-12-08 12:19:15 -05:00
Vadim Pisarevsky
a15707bc57
Merge pull request #5765 from alalek:pthread_mutex_init
2015-12-08 16:49:41 +00:00
Dan
76760470f3
Cherry pick failed to grab interface changes.
2015-12-08 09:54:14 -05:00
Dan Moodie
4f373a4284
Clarified default allocator interface.
...
Conflicts:
modules/core/src/matrix.cpp
2015-12-08 09:45:13 -05:00
Vadim Pisarevsky
0de6165863
Merge pull request #5660 from jet47:cuda-wrap-stream-3.0
2015-12-08 12:28:57 +00:00
Alexander Alekhin
78376c0f63
pthreads: remove usage of non-POSIX PTHREAD_RECURSIVE_MUTEX_INITIALIZER* defines
...
related issues: #5423 #5476
2015-12-08 13:55:02 +03:00
Vadim Pisarevsky
7172c16435
Merge pull request #5717 from jet47:cuda-maxwell-fixes
2015-12-07 10:16:48 +00:00
Vadim Pisarevsky
d19897b734
Merge pull request #5651 from hoangviet1985:fix_solvePoly_3.0.0
2015-12-07 10:12:54 +00:00
Vadim Pisarevsky
d4245aa45c
Merge pull request #5704 from sturkmen72:patch-3
2015-12-07 10:09:57 +00:00
Suleyman TURKMEN
8418d564a8
Documentation patch for cv::mixChannels
2015-12-03 22:49:28 +02:00
Maksim Shabunin
0e5c710757
Fix documentation warning
2015-12-03 17:30:45 +03:00
Maksim Shabunin
5c5d0e6743
Fixed NEON compilation issue
2015-12-03 15:41:23 +03:00
Maksim Shabunin
b4bcdd10a1
HAL: improvements
...
- added new functions from core module: split, merge, add, sub, mul, div, ...
- added function replacement mechanism
- added example of HAL replacement library
2015-12-03 14:43:37 +03:00
Vladislav Vinogradov
2afb02fcb4
fix BORDER_WRAP processing on Maxwell generation
2015-11-27 16:45:26 +03:00
Vadim Pisarevsky
313dc32606
Merge pull request #5644 from hoangviet1985:splitError
2015-11-23 13:43:38 +00:00
hoangviet1985
e679d97100
remove redundant code
2015-11-22 14:32:18 -05:00
Maksim Shabunin
3ae21095df
Merge pull request #5448 from Milania1:doc_normalize
2015-11-22 18:07:13 +00:00
Maksim Shabunin
626ccfe410
Merge pull request #5525 from Milania1:doc_normTypes
2015-11-22 18:05:46 +00:00
Maksim Shabunin
ddf293a081
Merge pull request #5649 from hoangviet1985:solve_pow(x,3)=0_opencv300
2015-11-22 18:02:40 +00:00
hoangviet1985
3e96b724c2
squash
2015-11-20 15:03:32 -05:00
hoangviet1985
b96def885f
squash
2015-11-20 14:48:29 -05:00
Maksim Shabunin
3cb76d5c66
Merge pull request #5663 from bertmsk:patch-1
2015-11-20 15:28:26 +00:00
Maksim Shabunin
047bda32d8
Merge pull request #5665 from paroj:matx_norm
2015-11-20 15:26:39 +00:00
Maksim Shabunin
e8bf4417ef
New variant of iOS framework building, fixed some warnings for XCode 7.1.1 and cmake 3.3.2
2015-11-17 15:30:01 +03:00
Pavel Rojtberg
c209f795b5
support for NORM_L2SQR in norm(Matx<..>)
2015-11-13 14:29:56 +01:00
Bert
d3b0bda011
Update system.cpp
...
FreeBSD compilation fix
2015-11-13 11:03:34 +03:00
Vladislav Vinogradov
39854ceda4
cuda::StreamAccessor::wrapStream and cuda::EventAccessor::wrapEvent
...
to import existed CUDA stream or CUDA event to OpenCV
2015-11-12 13:38:29 +03:00
Vadim Pisarevsky
b4112a5878
Merge pull request #5480 from dtmoodie:vecgpumat
2015-11-10 17:02:21 +00:00
Vadim Pisarevsky
3942b1f362
Merge pull request #5340 from alalek:ocl_off
2015-11-10 16:53:36 +00:00
Vadim Pisarevsky
de49ed3c15
Merge pull request #5388 from alalek:disable_invalid_string_usage
2015-11-03 10:58:57 +00:00
Pavel Vlasov
4d7f9e06e8
Fix for copy with mask 32s and 8u;
2015-11-02 18:00:22 +03:00
Chris Kitching
0f8a266787
Make Mat assertion failures more helpful
...
Instead of chaining a bunch of sanity checks together with "&&", let's just have several asserts. That way, when an assert fails, you don't get a monsterous "<huge evil expression>
failed" error, but only the bit you care about, making your life rather a lot easier.
2015-11-01 01:02:15 +00:00
Alexander Alekhin
debe99f1a4
Merge pull request #5531 from mshabunin:fix-vs2015
2015-10-22 16:28:42 +00:00
Maksim Shabunin
4e7a14355d
Merge pull request #5499 from StevenPuttemans:fix_mask_notice_copyTo
2015-10-22 12:27:45 +00:00
Maksim Shabunin
31e0d90da6
Enable temp objects destruction test for VS versions less than 2015
2015-10-22 12:44:03 +03:00
Vadim Pisarevsky
66f2000548
Merge pull request #5532 from grundman:patch-2
2015-10-21 11:54:30 +00:00
Maksim Shabunin
6e9d0d9a0c
Visual Studio 2015 warning and test fixes
2015-10-20 12:48:37 +03:00
Renato Florentino Garcia
f5b98bea41
Fix behavior of Matx 12 and 16 args constructors.
...
The 12 and 16 arguments Matx constructors differs from all others,
leaving values initialized and requiring the argument number to be equal
to the channels number.
2015-10-18 23:16:21 -02:00
grundman
f260b13a6f
Fix racy modification of ForThread::m_state during invocation of stop()
2015-10-16 11:19:27 -07:00
Jan S. (Milania1)
3e0b1f2845
Added example to the documentation for the NormTypes enum (L1, L2, INF)
2015-10-15 19:16:07 +02:00
StevenPuttemans
0a708e4070
adding extra explanation for mask parameter
2015-10-13 15:19:50 +02:00
Dan
1e1f20cfee
Improved consistency.
2015-10-12 09:21:53 -04:00
Pavel Vlasov
89eee6ca99
Fixes for IPP integration:
...
dotProd_16s - disabled for IPP 9.0.0;
filter2D - fixed kernel preparation;
morphology - conditions fix and disabled FilterMin and FilterMax for IPP 9.0.0;
GaussianBlur - disabled for CV_8UC1 due to buffer overflow;
integral - disabled for IPP 9.0.0;
IppAutoBuffer class was added;
2015-10-12 10:51:28 +03:00
Dan Moodie
3d1355efc1
Updated input / output array to support std::vector<cv::cuda::GpuMat>
...
Expanded support for std::vector<cv::cuda::GpuMat>.
Whitespace fix.
2015-10-09 15:12:57 -04:00
Jan S. (Milania1)
3d2a24f61d
Added example to the documentation for the normalize() method
2015-10-04 20:23:45 +02:00
Pavel Vlasov
6a0d3b06f2
IPPInitSingelton initialization guards;
2015-10-01 17:48:49 +03:00
Pavel Vlasov
e837d69f8f
IPPInitSingelton was added to contain IPP related global variables;
...
OPENCV_IPP env var now allows to select IPP architecture level for IPP9+;
IPP initialization logic was unified across modules;
2015-10-01 09:58:48 +03:00
Pavel Vlasov
62854dcc0d
Enables support of IPP 9.0.0;
...
HAVE_IPP_ICV_ONLY will be undefined if OpenCV was linked against ICV packet from IPP9 or greater. ICV9+ packets will be aligned with IPP in OpenCV APIs
This will ease code management between IPP and ICV
2015-09-29 17:27:13 +03:00
Alexander Alekhin
dd9da53860
disable String(int) ctor
...
MSVC and GCC compilers interprets cv::String a(0) as a valid
statement with conversion of "int" argument to "const char*".
This patch forbids this expected behaviour.
2015-09-27 14:54:11 +03:00
Pavel Vlasov
14b006e808
IPP_VERSION_X100 was changed to:
...
IPP_VERSION_MAJOR * 100 + IPP_VERSION_MINOR*10 + IPP_VERSION_UPDATE
to manage changes between updates more easily.
IPP_DISABLE_BLOCK was added to ease tracking of disabled IPP functions;
2015-09-25 17:50:15 +03:00
Pavel Vlasov
2177c7c5a8
Some IPP functions were encapsulated;
...
Minor changes to IPP implementations;
2015-09-25 17:30:26 +03:00
Pavel Rojtberg
46ada3886f
fix wrong parsing of values containing '='
...
fixes #5074
2015-09-24 17:27:07 +02:00
Pavel Rojtberg
1dd7f546af
CommandLineParser: add special <none> value to disallow empty strings
...
some mandatory string keys like paths must not be empty. Add the special
default value `<none>` so the CommandLineParser can enforce this and
generate an according error message for us.
2015-09-23 15:43:46 +02:00
Pavel Rojtberg
a388806555
enable additional CommandLineParser tests
2015-09-22 18:37:51 +02:00
Pavel Rojtberg
2ced3ba276
CommandLineParser: throw on programmer error
...
requesting a previously undeclared key is most likely an programming
error. e.g. a typo "--unused vs --unsued".
So throw in those cases.
Add an according failure testcase.
2015-09-22 18:35:49 +02:00
Alexander Alekhin
d430e802f2
cmdparser: allow empty strings
2015-09-22 16:34:37 +03:00
Vadim Pisarevsky
9f697510ca
Merge pull request #5320 from berak:lda_fix
2015-09-22 10:38:46 +00:00
Alexander Alekhin
4bb4c92f68
Merge pull request #5376 from lupustr3:pvlasov/compare_16s_fix
2015-09-22 10:19:52 +00:00
Pavel Vlasov
33e659786f
Fix for cmp16s condition during IPP compare type convert;
2015-09-21 18:11:20 +03:00
Alexander Alekhin
d945aff132
Merge pull request #5371 from Dikay900:ports_to_master
2015-09-21 13:52:45 +00:00
Alexander Alekhin
a9b91bb400
Merge pull request #5372 from alalek:cmd_tests
2015-09-21 13:52:26 +00:00
Gleb Gladilov
2bc4486966
Added test of minMaxLoc on filling with maximums of int
2015-09-21 13:44:30 +02:00
Gleb Gladilov
344d9fd83f
Fixed minMaxLoc and test functions
2015-09-21 13:44:29 +02:00
Elena Shipunova
5de01fde53
do not proceed with removing zero-length slice
2015-09-21 13:44:26 +02:00
Alexander Alekhin
05b1636780
Merge pull request #5329 from paroj:cliparser
2015-09-21 09:46:54 +00:00
berak
2f7c926670
remove usage of obsolete _dataAsRows flag
2015-09-21 07:59:09 +02:00
Alexander Alekhin
d3071db0d7
add some CommandLineParser tests
2015-09-20 13:14:41 +03:00
Pavel Rojtberg
96cc618410
has() should only test for the presence of the argument
...
and not consider its value. treat arguments with a set default value as
present.
2015-09-18 18:42:14 +02:00
Pavel Rojtberg
08dd126f08
do not parse empty default values and improve error messages
2015-09-18 18:42:14 +02:00
Alexander Alekhin
0051208684
Merge pull request #5349 from lupustr3:pvlasov/tls_update
2015-09-18 14:39:08 +00:00
Alexander Alekhin
d2b10d8aa1
Merge pull request #5355 from renatoGarcia:master
2015-09-18 13:38:29 +00:00
Alexander Alekhin
af0942c78f
Merge pull request #5335 from Dikay900:ports_to_master
2015-09-18 11:06:08 +00:00
Pavel Vlasov
aa485ccd75
TLS keys leak fix;
...
Disables TLS copy constructor and operator, as they can lead to errors and reservation of too much keys in TLS storage;
gather method was added to TLS to gather data from all threads;
2015-09-17 15:49:20 +03:00
Renato Florentino Garcia
1a18fa1c94
Correct a typo.
2015-09-16 21:16:23 -03:00
Vadim Pisarevsky
9533982729
Merge pull request #5272 from avershov:opencl-vaapi-fallback
2015-09-14 11:54:20 +00:00
Alexander Alekhin
bf42b9603b
fix "unreachable code" warning
2015-09-14 13:11:12 +03:00
Alexander Alekhin
1a8d7f9587
ocl: temporary restore OpenCL tls data (ocl.cpp without fix)
2015-09-13 20:28:24 +03:00
Alexander Alekhin
7213e5f68a
ocl: correct disabling of OpenCL code
2015-09-13 20:28:23 +03:00
Ilya Lavrenov
df21a24f81
initialize padding of CvString with zeros
2015-09-13 12:38:10 +02:00
Ilya Lavrenov
0303e8067e
fixed memory leak in core ds tests
2015-09-11 18:46:52 +02:00
Alexey Ershov
933ad0e710
changed call to getDefault: false to true in fallback initialization
2015-09-10 14:36:40 +03:00
Alexander Alekhin
ad70ab404c
ocl: workaround for getUMat()
2015-09-09 18:56:14 +03:00
Andrey Pavlenko
cea2dafa0f
man/unmap, preventing getMat/getUMat from temp object, fix thread-unsafe code in UMat::getMat()
2015-09-09 18:05:29 +03:00
Alexander Alekhin
536634b1fe
Merge pull request #5293 from alalek:tapi_custom_ptr_perf
2015-09-09 14:59:17 +00:00
Alexander Alekhin
cdfdf29eca
Merge pull request #5292 from alalek:tapi_custom_ptr
2015-09-09 14:58:28 +00:00
Alexey Ershov
5937e58a11
fixed argument in call to {Input|Output}Array.getMat()
2015-09-08 19:29:19 +03:00
Alexey Ershov
949410b347
separated UMat & Mat usage in interop/copy paths
2015-09-07 21:11:05 +03:00
Maksim Shabunin
5618f4a0ac
Fixed: Concurrency static scheduler release failed
2015-09-07 18:59:07 +03:00
Alexey Ershov
68a0347ff9
fallback path & sample timing implemented
...
fixed trailing whitespaces
renamed files *vaapi* to *va_intel*
changed names vaapi* to va_intel*
2015-09-04 02:42:49 +03:00
Alexander Alekhin
4ecc023219
UMat: add perf test for custom ptr
2015-09-03 10:48:07 +03:00
Alexander Alekhin
8694ba0978
update custom_ptr test
2015-09-03 10:46:38 +03:00
Maksim Shabunin
8c65f8a0d1
fixup! Some changes to support mingw-w64
2015-09-01 13:49:23 +03:00
Maksim Shabunin
771af4f32d
Some changes to support mingw-w64
...
- IPP is disabled by default when compiler is mingw (couldn't make it
work)
- fixed some warnings
- fixed some `__GNUC__` version checks (for correctness and convenience)
- removed UTF-8 BOM from hough.cpp (fixes #5253 )
2015-09-01 00:59:08 +03:00
Vadim Pisarevsky
a78da45fec
Merge pull request #5242 from apavlenko:fix_releasing_temp_umat
2015-08-27 14:29:52 +00:00
Andrey Pavlenko
b78eb49178
removing a garbage comment
2015-08-26 14:15:18 +03:00
Andrey Pavlenko
4aefb9f2fc
making the test deepper
2015-08-26 13:38:26 +03:00
Andrey Pavlenko
3656a1aa66
fixing 'map_unmap_counting'
2015-08-25 17:25:03 +03:00
Vadim Pisarevsky
edcd2c0408
Merge pull request #4176 from alalek:issue_4461
2015-08-25 07:46:28 +00:00
Andrey Pavlenko
f6b758699b
Revert merging of pull request #5176 from vladimir-dudnik:master (reverted from commit 5ee00ec5c6
)
2015-08-24 19:22:22 +03:00
Vadim Pisarevsky
bd8bac27d5
Merge pull request #4212 from ludv1x:master
2015-08-24 14:20:54 +00:00
Vadim Pisarevsky
ff8aa6662e
Merge pull request #5201 from alalek:move_semantics
2015-08-24 11:05:43 +00:00
Philippe FOUBERT
b668d3f693
Modification of the related tests in core/tests/ocl
2015-08-22 13:39:34 +02:00
Philippe FOUBERT
0629add3f7
Fix issue #5234 (UMat::convertTo when noScale)
2015-08-22 13:16:59 +02:00
Vitaliy Lyudvichenko
85cc11e3b2
Changed behaviour of Mat/UMat::reshape() to accept n-dim shapes
2015-08-21 19:26:29 +03:00
Alexander Alekhin
b8956d0111
tls: fix access to array (out of bounds)
2015-08-21 16:43:15 +03:00
Alexander Alekhin
44f8670719
Merge pull request #5171 from avershov:opencl-vaapi-interop
2015-08-21 12:47:14 +00:00
Philipp Hasper
14c0bfce2f
kmeans and one-dimensional vectors
...
Clustering one-dimensional data was only possible when storing it column-based. But a std::vector is interpreted as matrix with height=1
Additionally, made conditionals more readable
2015-08-21 14:20:00 +02:00
Alexey Ershov
a8656ea20f
implemented core support & sample
...
fixed whitespaces
fixed issues
fixed issue
fixed module statement issues
fixed access mode
added initialization check
fixed warning
2015-08-21 02:44:03 +03:00
Alexander Alekhin
c1778f1199
Merge pull request #5161 from alalek:fix_string
2015-08-20 12:49:54 +00:00
Maksim Shabunin
4a067dca58
Merge pull request #5154 from brunomorishita:patch-1
2015-08-19 15:22:35 +00:00
Alexander Alekhin
887d8d091b
Merge pull request #5177 from lupustr3:pvlasov/tls_fixes
2015-08-19 14:18:19 +00:00
Pavel Vlasov
a33d98c13a
TLS memory leaks were fixed;
...
TLS was redesigned in more straightforward way;
OPENCV_ABI_COMPATIBILITY define was added;
2015-08-19 13:31:44 +03:00
thebucc
421e1b237c
Fix for bug #5007 : moved definition of Size_MatDepth_t and Size_MatDepth from ts_perf.hpp to perf_channels.cpp. This way they are closer to where they are needed and live in a different namespace (possibly the reason why the fix works).
2015-08-17 16:09:00 +01:00
Vladimir Dudnik
58934f1e16
add condition to skip unmapping for internally allocated host memory. this should fix map_unmap_counting UMat test.
2015-08-17 14:36:34 +03:00
Alexander Alekhin
e65de8d1da
fixes for MSVS compiler optimizer
2015-08-16 02:03:04 +03:00
Alexander Alekhin
ac37b77452
c++ move semantics for cv::UMat
2015-08-16 02:02:26 +03:00
Alexander Alekhin
306aa0e699
c++ move semantics for cv::Mat_
2015-08-16 02:02:25 +03:00
Alexander Alekhin
1afc9eb730
c++ move semantics for cv::Mat
2015-08-16 02:02:24 +03:00
Alexander Alekhin
5a0af53683
c++ move semantics for cv::Ptr<>
2015-08-15 16:45:19 +03:00
Bruno Goncalves
cf4025c224
fix documentation code formulas
2015-08-13 23:13:47 -03:00
Alexander Alekhin
68f8d1cef0
Merge pull request #5164 from vladimir-dudnik:test-umat-copyTo-issue
2015-08-13 14:59:07 +00:00
Vladimir Dudnik
6bb8afde96
fixed typo in OpenCLAllocator.upload method (wrong step used)
2015-08-11 16:01:05 +03:00
Vladimir Dudnik
131d7c394e
enabled test UMat copyTo. Now it will detect FAIL on Intel platform for ROI (issue with clEnqueueCopyBufferRect)
2015-08-11 14:19:14 +03:00
Vladimir Dudnik
ef0d1c1c3f
fixed download/upload for non contiguous umat
2015-08-11 01:33:46 +03:00
Alexander Alekhin
cda9ed449f
fix some functions for valid processing of empty string content (cstr_==0, len_==0)
2015-08-10 18:08:58 +03:00
Alexander Alekhin
09b9b0fb9e
Merge pull request #5135 from alalek:issue_4468
2015-08-10 14:46:31 +00:00
Alexander Alekhin
3316e58314
more test loops (and disable tests - tests pass but require a lot of time)
2015-08-10 14:44:28 +03:00
Anatoly Baksheev
0dab097a26
minor comment fix
2015-08-07 12:55:10 +03:00
Alexander Alekhin
8293ed7f9b
add tests from issue 4468 ( #5062 )
2015-08-06 13:50:13 +03:00
Alexander Alekhin
21467d817b
tapi: add test from issue 4380 ( #5010 )
2015-08-05 16:08:48 +03:00
Vadim Pisarevsky
3f65a86977
Merge pull request #4233 from alalek:fix_4006
2015-08-03 05:46:29 +00:00
Alexander Alekhin
fe0a17e78f
fix build with Win7 SDK
2015-07-30 23:23:01 +03:00
Alexander Alekhin
1704aea6a0
tapi: enable some disabled tests
2015-07-30 19:21:24 +03:00
Alexander Alekhin
2b2bc83b61
Merge pull request #4238 from vladimir-dudnik:d3d11-nv12-interop
2015-07-30 10:36:25 +00:00
Vladimir Dudnik
6bd01a96d9
finished with NV12 support for D3D11-interop. Now, if texture is in NV12 format then it will be converted to/from BGR UMat.
2015-07-29 19:52:05 +03:00
Vladimir Dudnik
d4774ead43
d3d11-nv12 interop
...
fixed issues with ocl nv12 cvt kernel
finisged ocl nv12-to-rgba kernel, update dx-interop samples. (ocl rgba-to-nv12 kernel will be added later)
an attempt to fix build issue
fix for non opencl build issue
fix typo
fix compilation warnings
fix compile issue for Mac (OpenCL)
add convertion from rgba to nv12 (still need to debug kernel)
remove empty line at the EOF
fixed compilation warning
2015-07-29 19:52:03 +03:00
Alexander Alekhin
9bcccb028b
fixes
2015-07-28 11:49:46 +03:00
Alexander Alekhin
cd5c70691a
ocl: add map tests
2015-07-28 11:49:46 +03:00
Alexander Alekhin
b36f565d13
fix OpenCV code (bug 4006: #4862 )
2015-07-28 11:49:41 +03:00
Vladimir Dudnik
ed7907e46c
add test for bug 4006: #4862
2015-07-28 11:49:02 +03:00
Alexander Alekhin
c94945f892
Merge pull request #4210 from wangyan42164:ocl_umat_convert
2015-07-27 15:05:57 +00:00
Yan Wang
132416ebe9
It is unnecessary to use fma() if no scaling.
...
Signed-off-by: Yan Wang <yan.wang@linux.intel.com>
2015-07-23 10:18:11 +08:00
Alexander Alekhin
c0ee03fab2
Merge pull request #4192 from avershov:opencl-opengl-buffer
2015-07-21 14:10:00 +00:00
Vadim Pisarevsky
03824682ad
Merge pull request #4189 from vladimir-dudnik:update_dx_samples
2015-07-21 11:55:21 +00:00
Alexey Ershov
89392b2a6d
added convertToGLBuffer() & convertFromGLBuffer() functions; added OpenGL interop sample comment
...
rewrite & change convertFromGLBuffer() & convertToGLBuffer() into acquireGLBuffer() & releaseGLBuffer(), respectively
opengl sample: added buffer support
tested and fixed buffer support on Windows
change glFlush() call to glFinish()
added UMat::release() call; fixed functions' names
adopted & implemented API suggestion(s) from Alexander
fixed unreachable code warning
added more info to the mapGLBuffer/unmapGLBuffer description
2015-07-21 13:42:17 +03:00
Philipp Hasper
2b7637df36
Fixed buffer overflow in string handling
...
pos should never exceed strlen, else the overflow check 'if (!len)' will wrongfully pass
2015-07-20 09:00:24 +02:00
Vladimir Dudnik
dee05f982b
compute fps changed (now only interop counts). fixed d3d10 and d3d11 print info method (there were issues with texture mapping)
2015-07-13 23:40:45 +03:00
Alexander Alekhin
88e66697a7
t-api: try to fix allocator fallback code paths
...
issue: http://code.opencv.org/issues/4461
2015-07-09 13:26:59 +03:00
Alexander Alekhin
06617392e0
workaround issue with MatExpr
2015-07-08 16:22:59 +03:00
Alexander Alekhin
a6f46d7bb1
issue 4457
2015-07-08 16:22:58 +03:00
Vadim Pisarevsky
743160b6ac
Merge pull request #4158 from alalek:fix-bigdata-copyto
2015-07-08 10:00:46 +00:00
Alexander Alekhin
40fcc9d149
Merge pull request #4159 from alalek:vector_processing
2015-07-06 13:22:57 +00:00
Alexander Alekhin
c0d61964d6
ocl: fix unaligned memory access
...
http://code.opencv.org/issues/4462
2015-07-06 13:58:17 +03:00
Alexander Alekhin
ca692b9804
Merge pull request #4168 from Dikay900:export_threadcontrol
2015-07-02 11:31:16 +00:00
Alexander Alekhin
f4cb8c0dfb
Merge pull request #4127 from avershov:opengl-opencl-sample
2015-07-02 11:24:10 +00:00
Alexander Alekhin
885114ed2c
fix copyTo memory corruption, but the main problem is still here
2015-07-02 13:47:59 +03:00
Dikay900
3ebb5d0e3b
export thread control to python aswell
2015-07-01 22:55:12 +02:00
Alexander Alekhin
30a5a9ed34
test vector processing
2015-07-01 20:10:22 +03:00
Vadim Pisarevsky
c81b064727
Merge pull request #4164 from kalistratovag:parallel_mjpeg
2015-07-01 14:15:52 +00:00
Vadim Pisarevsky
d5afd070ce
Merge pull request #4094 from kashefy:Mat_push_back_MatExpr_bug_4340
2015-07-01 09:09:51 +00:00
Alexey Ershov
9dfa9a81e9
eliminated unused function __OpenCLinitializeGL(), simplified query device logic
2015-06-30 21:27:15 +03:00
kalistratovag
65e0387aa5
Implementing parallel mjpeg encoder.
...
Fixed errors in parallel_for based on pthreads
Fixing compiler errore & removing whitespaces
Fixing prallel_for_pthreads error and warnings on win
2015-06-30 13:57:37 +03:00
Youssef Kashef
790ef21a60
add unit test around Mat::push_back()
...
add template specialization Mat::push_back() for MatExpr paramters
extend push_back MatExpr to mat in unit test
cast to object instead of reference
test with multi-row MatExpr input
2015-06-30 10:29:40 +02:00
Alexander Alekhin
50b453e5c2
Merge pull request #4150 from alalek:opencv_org_issue_4428
2015-06-29 17:08:54 +00:00
Alexey Ershov
3f68787051
OpenGL OpenCL sample
...
057cd52 first versions: cv::ogl::convertFromGLTexture2D & cv::ogl::convertToGLTexture2D
5656e94 added autogenerated stuff for cl_gl.h
765f1fd resolved CL functions in opengl.cpp
9f9fee3 implemented function cv::ogl::ocl::initializeContextFromGLTexture2D()
a792adb cv::ogl::ocl::initializeContextFromGLTexture2D() - added linux support (glx.h)
51c2869 added missing error message in function cv::ogl::ocl::initializeContextFromGLTexture2D()
513b887 fixed extension call in function cv::ogl::ocl::initializeContextFromGLTexture2D()
475a3e9 added CL-GL interop Windows sample (gpu/opengl_interop.cpp)
07af28f added building of CL-GL interop sample - Windows only
befe3a2 fixed whitespace errors & doxygen warnings (precommit_docs)
551251a changed function name to cv::ogl::ocl::initializeContextFromGL(), removed unused argument
4d5f009 changed CL_DEVICES_FOR_GL_CONTEXT_KHR to CL_CURRENT_DEVICE_FOR_GL_CONTEXT_KHR
9fc3055 changed CL_DEVICES_FOR_GL_CONTEXT_KHR to CL_CURRENT_DEVICE_FOR_GL_CONTEXT_KH
6d31cee Revert "changed CL_DEVICES_FOR_GL_CONTEXT_KHR to CL_CURRENT_DEVICE_FOR_GL_CONTEXT_KH"
cc6a025 added texture format check in cv::ogl::convertFromGLTexture2D()
063a2c1 CL-GL sample: added Linux implementation (Xlib/GLX)
c392ae9 fixed trailing whitespace
85a80d0 fixed include files
ae23628 excluded samples/opengl from build case 2
9870ea5 added android EGL support
530b64c added doxygen documentation comments to CL-GL interop functions
2015-06-26 14:15:12 +03:00
Alexander Alekhin
04b2edcc8c
ocl: autogenerated files for cl_gl.h
2015-06-26 14:08:27 +03:00
Alexander Alekhin
ee68d26f99
ocl: update generator scripts
2015-06-26 14:08:20 +03:00
Alexander Alekhin
24e2a008c3
copyTo: fix for big data (4Gb+)
2015-06-25 21:08:37 +03:00
Alexander Alekhin
8298644b85
Merge pull request #4151 from lupustr3:pvlasov/ipp_alignment
2015-06-24 16:45:13 +00:00
Vadim Pisarevsky
56e637d5f4
Merge pull request #4135 from lupustr3:ipp_code_refactoring
2015-06-24 16:18:55 +00:00
Pavel Vlasov
e57609836c
Warning fix;
2015-06-24 14:43:42 +03:00
Pavel Vlasov
101607a7d0
Imgproc_Hist_MinMaxVal.accuracy fix;
...
Some code style corrections;
2015-06-24 13:50:17 +03:00
Pavel Vlasov
8439b5942b
Proper IPP alignment;
2015-06-24 09:21:35 +03:00
Alexander Alekhin
53fc5440d7
implement singleton lazy initialization
2015-06-23 14:38:45 +03:00
Vadim Pisarevsky
81e1c043cc
Merge pull request #4142 from sturkmen72:patch-2
2015-06-22 11:51:39 +00:00
Vadim Pisarevsky
bd90425f71
Merge pull request #4136 from alalek:fix_matallocator_destruction
2015-06-22 11:49:36 +00:00
Suleyman TURKMEN
d64c8aad99
Update mat.hpp
...
spelling corrections
2015-06-20 11:18:47 +03:00
Vladimir Dudnik
217dd63e02
OpenCV-OpenCL interop (PR #4072 ):
...
Commits:
added new function, cv::ocl::attachContext(String& platformName, void* platformID, void* context, void* deviceID) which allow to attach externally created OpenCL context to OpenCV.
add definitions of clRetainDevice, clRetainContext funcs
removed definitions for clRetainContext, clRetainDevice
fixed build issue under Linux
fixed uninitialized vars, replace dbgassert in error handling
remove function which is not ready yet
add new function, cv::ocl::convertFromBuffer(int rows, int cols, int type, void* cl_mem_obj, UMat& dst, UMatUsageFlags usageFlags = cv::USAGE_DEFAULT) which attaches user allocated OpenCL clBuffer to UMat
uncommented clGetMemObjectInfo definition (otherwise prevent opencv build)
fixed build issue on linux and android
add step parameter to cv::ocl::convertFromBuffer func
suppress compile-time warning
added sample opencl-opencv interoperability (showcase for cv::ocl::convertFromBuffer func)
CMakeLists.txt modified to not create sample build script if OpenCL SDK not found in system
fixed build issue (apple opencl include dir and spaces in CMake file)
added call to clRetainContext for attachContext func and call to clRetainMemObject for convertFromBuffer func
uncommented clRetainMemObject definition
added comments and cleanup
add local path to cmake modules search dirs (instead of replacing)
remove REQUIRED for find_package call (sample build together with opencv). need to try standalone sample build
opencl-interop sample moved to standalone build
set minimum version requirement for sample's cmake to 3.1
put cmake_minimum_required under condition, so do not check if samples not builded
remove code dups for setSize, updateContinuityFlag, and finalizeHdr
commented out cmake_minimum_required(VERSION 3.1)
add safety check for cmake version
add convertFromImage func and update opencl-interop sample
uncommented clGetImageInfo defs
uncommented clEnqueueCopyImageToBuffer defs
fixed clEnqueueCopyImageToBuffer defs
add doxygen comments
remove doxygen @fn tag
try to restart buildbot
add doxygen comments to directx interop funcs
remove internal header, use fwd declarations in affected compile units instead
2015-06-19 13:33:22 +03:00
Alexander Alekhin
032b6322fc
fix MatAllocator creation/destruction issues
2015-06-18 14:02:01 +03:00
Dmitry Budnikov
a5a21019b2
ipp_countNonZero build fix;
...
Removed IPP port for tiny arithm.cpp functions
Additional warnings fix on various platforms.
Build without OPENCL and GCC warnings fixed
Fixed warnings, trailing spaces and removed unused secure_cpy.
IPP code refactored.
IPP code path implemented as separate static functions to simplify future work with IPP code and make it more readable.
2015-06-18 12:47:07 +03:00
Maksim Shabunin
7bfd070864
Merge pull request #4095 from alalek:hal_unresolved_symbols
2015-06-17 14:35:40 +00:00
Vadim Pisarevsky
fd225469bc
Merge pull request #4122 from alalek:fix_issue_3891
2015-06-17 11:13:27 +00:00
Alexander Alekhin
9394486147
fix issue 3891
2015-06-16 18:53:58 +03:00
Alexander Alekhin
a482dcce46
fix support for pthreads parallel_for
2015-06-11 16:53:07 +03:00
Maksim Shabunin
1f983ec39c
Fixed compilation of pthread-based parallel_for with gcc 4.4.3
2015-06-09 13:59:48 +03:00
Alexander Alekhin
8184e57dd6
fix tests build (win,shared,world)
2015-06-05 16:30:36 +03:00
Diogo Rolo
f57fb2375e
Update cuda.markdown
...
Small typo fix in the documentation.
It was written 'devie' instead of 'device' in: 'Switching active device can be done using cuda::setDevice() function'
2015-06-02 14:34:15 +01:00
Vadim Pisarevsky
a4073ed676
made improvements in ECC code (comments from https://github.com/Itseez/opencv/pull/3845 ), as well as minor tweak in pthread's based parallel for.
2015-06-02 01:30:00 +03:00
kalistratovag
bf5393ae58
parallel for on pthreads initial commit
...
removing trailing whitespaces
Compilation error on Mac fix & warning on android
Warnings fixed on iOs
2015-06-01 17:48:21 +03:00
Vadim Pisarevsky
b46719b093
Merge pull request #4074 from vpisarev:objdetect_fixes
2015-05-28 19:43:51 +00:00
Vadim Pisarevsky
481f786fe7
added simple HAL test; added RHO homography test
2015-05-28 17:05:43 +03:00
Philipp Hasper
6c55e7c039
Fixed doc typo
2015-05-27 07:34:27 +02:00
Vadim Pisarevsky
dc587992a0
Merge pull request #4053 from vpisarev:calib3d_fixes
2015-05-26 11:23:50 +00:00
Vadim Pisarevsky
85149f8686
hack solvePoly to finds roots of polynoms with zero higher-order coefficients. The roots are populated in this case, which is not valid, strictly speaking, but good enough for function like correctMatches. This solves http://code.opencv.org/issues/4330
2015-05-25 23:43:39 +03:00
Ruslan Baratov
9c8255feeb
Doc: fix definition of macro CV_MAKETYPE
...
At least this is how it's defined in core/types_c.h
Conflicts:
modules/core/doc/intro.rst
2015-05-23 19:09:34 +02:00
Camille
55a5e6be2c
bug fix 3696
2015-05-23 19:09:31 +02:00
Dikay900
7ca0557b40
typos in comments
2015-05-23 17:36:45 +02:00
Alexander Smorkalov
acbc7362db
Bug #3611 Initializing static cv::Mat with cv::Mat::zeros causes segmentation fault fixed.
...
fix MatOpInitializer
2015-05-23 17:36:35 +02:00
Vadim Pisarevsky
f32f0486e2
trying to eliminate warnings in Android build
2015-05-22 16:53:34 +03:00
Vadim Pisarevsky
d2aaa70e93
removed HAL calls from public OpenCV headers; put IPP calls back to hall:sqrt() and such (but they are disabled for now)
2015-05-22 16:04:10 +03:00
Vadim Pisarevsky
ef8182e12a
Merge pull request #4025 from vpisarev:features2d_fixes
2015-05-21 19:16:27 +00:00
Andrey Pavlenko
d67d32af48
Revert of "Merge pull request #4014 from sgjava:opencv-sgjava" (reverted from commit 52fa55a770
)
2015-05-19 13:30:18 +03:00
Vadim Pisarevsky
432cf1152a
added read/write functions for vector<DMatch> + the test ( http://code.opencv.org/issues/4308 )
2015-05-18 18:59:37 +03:00
Vadim Pisarevsky
a85bb091c8
Merge pull request #4018 from vpisarev:imgproc_video_fixes
2015-05-15 16:15:01 +00:00
Vadim Pisarevsky
4a9b244577
hopefully, fixed crash in sparse mat test
2015-05-15 16:15:10 +03:00
Vadim Pisarevsky
66eb270cf7
significantly reduced sparse matrix footprint:
...
http://code.opencv.org/issues/2206 ,
http://code.opencv.org/issues/2924
2015-05-14 23:29:09 +03:00
Vadim Pisarevsky
52fa55a770
Merge pull request #4014 from sgjava:opencv-sgjava
2015-05-14 18:23:28 +00:00
Vadim Pisarevsky
7dd67f4997
use _mm_sad_epu8 instead of _mm_movemask_epi8 in countNonZero. Therefore, we do not need any popcount table and this solves http://code.opencv.org/issues/4333
2015-05-14 20:33:53 +03:00
sgjava
8b3b2a52f0
Removed finalize() and added n_delete to release()
2015-05-13 13:45:19 -04:00
Maksim Shabunin
a7160d9b12
Docs: fixed _dest type in cv::compare
2015-05-13 18:46:21 +03:00
Maksim Shabunin
e22c09c601
Documentation for CommandLineParser
2015-05-13 18:46:21 +03:00
Vadim Pisarevsky
d280205245
fixed compile errors on ARM, as well as failures in OCL_Dft* regression tests
2015-05-06 10:00:10 +03:00
Vadim Pisarevsky
0ee8634b2f
fixed random failures in Core_DFT.complex_output2 test (the case of input_mat.cols == 1)
2015-05-05 20:31:30 +03:00
Vadim Pisarevsky
73f760fdf0
some more compile warnings fixed
2015-05-05 18:03:40 +03:00
Vadim Pisarevsky
931a519969
fixed warning in mathfuncs
2015-05-05 17:49:36 +03:00
Vadim Pisarevsky
63a63e3eaa
extended MinProblemSolver::Function to 1) report the space dimensionality, 2) compute gradient if needed
2015-05-05 15:56:06 +03:00
Vadim Pisarevsky
5b9182ba43
reenabled conjugate gradient solver test
2015-05-03 11:36:24 +03:00
Vadim Pisarevsky
5a31f6b4e1
ok, so probably the failure in downhill simplex has been finally solved
2015-05-03 11:31:49 +03:00
Vadim Pisarevsky
2ec92ba440
added test for http://code.opencv.org/issues/1918
2015-05-03 02:46:33 +03:00
Vadim Pisarevsky
01e351de37
refactored downhill simplex implementation a bit; hopefully, fixed the bug with random failures in the tests
2015-05-03 02:29:15 +03:00
Vadim Pisarevsky
a33d7928a4
Fixed getContinuousSize() to handle huge matrices properly. This should solve http://code.opencv.org/issues/3232
2015-05-02 22:12:12 +03:00
Vadim Pisarevsky
9c0b740b84
improved randShuffle as suggested by John Stark in http://code.opencv.org/issues/3730
2015-05-02 21:31:47 +03:00
Vadim Pisarevsky
96b5ec14d4
fixed bug with simplex initialization in Downhill solver (thanks to Toby Rule for the patch): http://code.opencv.org/issues/3990 .
...
re-enabled Downhill solver test, let's see how it goes
2015-05-02 20:59:57 +03:00
Vadim Pisarevsky
79ac0d05ce
added test checking http://code.opencv.org/issues/4050
2015-05-02 20:38:30 +03:00
Vadim Pisarevsky
9fbd1d68ad
refactored div & pow funcs; added tests for special cases in pow() function.
...
fixed http://code.opencv.org/issues/3935
possibly fixed http://code.opencv.org/issues/3594
2015-05-01 21:49:11 +03:00
Vadim Pisarevsky
74e2b8cbcb
fixed invalid output of cv::dft when using DFT_ROWS + DFT_COMPLEX_OUTPUT ( http://code.opencv.org/issues/3428 )
2015-04-29 23:08:22 +03:00
Vadim Pisarevsky
7918267d02
fixed U non-orthogonality in SVD ( http://code.opencv.org/issues/3801 )
2015-04-29 16:09:58 +03:00
Vadim Pisarevsky
135fa85e8f
added vector<bool> support ( http://code.opencv.org/issues/3826 )
2015-04-29 15:36:45 +03:00
Vadim Pisarevsky
d8f360316d
fixed http://code.opencv.org/issues/3828 , added test. thanks to berak for the patch
2015-04-29 13:12:53 +03:00
Vadim Pisarevsky
0746ec7035
fixed http://code.opencv.org/issues/4278
2015-04-29 11:58:49 +03:00
Vadim Pisarevsky
a8226814c5
fixed http://code.opencv.org/issues/4189
2015-04-29 11:47:12 +03:00
Thomas Gabrowski
63dbeeaac5
Fix iOS warnings about implicit conversion precision by changing double literals to float ones
...
Conflicts:
modules/contrib/include/opencv2/contrib/retina.hpp
2015-04-26 12:22:41 +02:00
Mansour Moufid
b99f7a29df
Cast some image coordinates and sizes to double.
...
Conflicts:
modules/gpu/perf/perf_imgproc.cpp
Cast a long integer to double explicitly.
Conflicts:
modules/python/src2/cv2.cpp
Cast some matrix sizes to type int.
Change some vector mask types to unsigned.
Conflicts:
modules/core/src/arithm.cpp
2015-04-25 18:54:53 +02:00
Boris Daskalov
3b5530fb67
Fix a bad free space check in icvGrowSeq.
...
A difference of two pointers was casted to unsigned which can lead to
overflow on 64-bit systems.
2015-04-25 18:54:51 +02:00
Vadim Pisarevsky
7dd19f6d97
Merge pull request #3939 from paroj:fmtfix
2015-04-22 12:15:17 +00:00
Vadim Pisarevsky
063e4004ba
Merge pull request #3935 from vpisarev:extending_hal_part1
2015-04-21 14:02:02 +00:00
Pavel Rojtberg
78eac67a01
clean up cvTriangulatePoints by using C++ primitives directly.
...
- fixes the Calib3d_StereoCalibrate_C testcase.
update comment regarding cv::SVD::MODIFY_A
2015-04-21 11:29:26 +02:00
Pavel Rojtberg
b02fc039cd
fix python and numpy output formatters
2015-04-17 17:42:24 +02:00
Vadim Pisarevsky
ee11a2d266
fully implemented SSE and NEON cases of intrin.hpp; extended the HAL with some basic math functions
2015-04-16 23:00:26 +03:00
Vadim Pisarevsky
a2bba1b9e6
HAL extensions: added initial version of universal intrinsics (C implementation and SSE2, NEON - TBD). added empty files where some functionality from core and imgproc will be moved to
2015-04-15 00:36:27 +03:00
Ilya Lavrenov
17bedd72f0
workaround for stange internal compiler error when cross-compiling with 4.6
2015-04-14 16:55:11 +03:00
Vadim Pisarevsky
5b3f89df0a
Merge pull request #3911 from vpisarev:core_tweaks
2015-04-07 19:03:48 +00:00
Vadim Pisarevsky
259e41da73
reverted "typedef _InputArray InputArray", fixed warning from doxygen
2015-04-07 19:34:51 +03:00
Maksim Shabunin
35b2139929
Basic HAL module
2015-04-07 18:16:22 +03:00
Vadim Pisarevsky
052593c760
1. Input/OutputArray optimizations;
...
2. Algorithm::load/save added (moved from StatModel)
3. copyrights updated; added copyright/licensing info for ffmpeg
4. some warnings from Xcode 6.x are fixed
2015-04-07 16:44:26 +03:00
Dmitry-Me
75a65542ba
Reduce variables scope
2015-03-25 17:17:06 +03:00
Vadim Pisarevsky
5501cfd809
Merge pull request #3814 from erikrk:denoising-16bit-master
2015-03-24 15:23:58 +00:00
Vadim Pisarevsky
f7f10a7d2c
Merge pull request #3854 from Dmitry-Me:reduceVariableScope8
2015-03-24 15:13:34 +00:00
Vadim Pisarevsky
70ff448067
Merge pull request #3859 from NewProggie:fix-doc-typo
2015-03-24 15:08:03 +00:00
Vadim Pisarevsky
54deb5ed5a
Merge pull request #3860 from theodr:document_hconcat_vconcat
2015-03-24 15:07:34 +00:00
theodore
02c3d8d792
documentation for the hconcat and vconcat functions
2015-03-24 13:59:09 +01:00
Vadim Pisarevsky
5a0c7a1330
Merge pull request #3853 from alalek:ocl_fix_bufferpool_cleanup
2015-03-23 08:10:22 +00:00
Vadim Pisarevsky
7ab7322915
Merge pull request #3848 from yxiong:fix-4125
2015-03-23 08:04:41 +00:00
Vadim Pisarevsky
daa99514fa
Merge pull request #3846 from mshabunin:fix-headers
2015-03-23 08:01:25 +00:00
Kai Wolf
f815bbab24
Fix typo in types_c.h
2015-03-22 10:55:54 +01:00
Dmitry-Me
ce167e233b
Reduce variable scope
2015-03-20 13:27:08 +03:00
Alexander Alekhin
b5529aef9c
ocl/bufferpool: fix cleanup
2015-03-20 13:21:10 +03:00
Ying Xiong
decbdd1abb
Fix compiler error on std::swap (CUDA7.0/clang/OSX)
2015-03-19 14:23:44 -04:00
Vadim Pisarevsky
9683f93a76
Merge pull request #3840 from MSOpenTech:concurrency-contrib
2015-03-19 15:11:01 +00:00
Vadim Pisarevsky
9997e6d337
Merge pull request #3823 from lupustr3:pvlasov/implementation_detector_update
2015-03-19 12:47:22 +00:00
Maksim Shabunin
d5b954c2d4
Moved property implementation macros to private header
2015-03-18 17:33:12 +03:00
Maksim Shabunin
7335a40a61
Replaced CV_PURE_PROPERTY macros with corresponding code
2015-03-18 17:23:42 +03:00
Maxim Kostin
d1a8171011
Added WinRT concurrency support.
2015-03-18 15:13:08 +03:00
Philipp Hasper
e0efda7145
Fixed persistent.hpp documentation
...
Small error - object fs does not exist in this code example
2015-03-17 15:28:37 +01:00
Vadim Pisarevsky
c6e9280373
Merge pull request #3816 from ilya-lavrenov:il/cvround
2015-03-16 09:09:55 +00:00
Dmitry-Me
8ed4bae4dd
Reduce variable scope, make formatting consistent with surrounding code
2015-03-14 12:50:42 +03:00
Pavel Vlasov
085409340e
Implementation collector update;
...
Moved out of TLS to properly collect data from different threads;
Concurrent access guards were added to collection functions;
2015-03-12 17:58:03 +03:00
Ilya Lavrenov
6f8b3fc633
cvRound
2015-03-11 16:14:39 +03:00
Roman Donchenko
6274e1fc5f
cvOpenFileStorage: reduce the scope of xml_buf and make sure it's freed...
...
... before any exceptions occur.
(cherry picked from commit 08da247a87
)
2015-03-10 12:38:45 +03:00
Roman Donchenko
6b8ebf3e94
Fix memory leaks appearing when cvOpenFileStorage throws
...
(cherry picked from commit 16ce114e0c
)
2015-03-10 12:38:45 +03:00
Vadim Pisarevsky
baf191fab2
Merge pull request #3771 from mshabunin:arm-round
2015-03-09 21:49:15 +00:00
Vadim Pisarevsky
64bd77cf4d
Merge pull request #3794 from vpisarev:ubuntu_x86_fixes
2015-03-09 21:34:17 +00:00
Erik Karlsson
5a7118a88b
Merging in master
2015-03-09 22:00:58 +01:00
Maksim Shabunin
451972f3cf
Added ARM implementation in cvRound function
...
- note: uses VFPv3 instructions
- also added overloaded cvRound variants with float and int parameters
- thanks to Marina Kolpakova from Itseez for idea
- thanks to developers from #llvm IRC channel for help with inline asm
2015-03-06 16:14:37 +03:00
Vadim Pisarevsky
5d8a1bf813
explained reason why IPP is disabled on 32-bit Linux. disable IPP's minMaxLoc_32f on 32-bit OSes only
2015-03-06 15:02:22 +03:00
Dmitry-Me
2fb4178f7c
Reduce variable scope
2015-03-06 10:17:37 +03:00
Vadim Pisarevsky
7a52c3d9f1
1) make sure Python 2.7 is detected on Ubuntu (including libs) when it's there.
...
2) disable IPP on 32-bit Linux when OpenCV is built as shared libs. Otherwise we get linker errors
3) disable IPP's minMaxIdx 32-bit floating-point flavor in a hope that it fixes some test failures
2015-03-05 18:58:54 +03:00
Vadim Pisarevsky
aa113c5a85
Merge pull request #3787 from Dmitry-Me:fixNullPointerDereference2
2015-03-05 12:19:02 +00:00
Dmitry-Me
d164d51380
Fix potential null pointer dereference
2015-03-05 10:31:51 +03:00
Vadim Pisarevsky
f9b8ce1d25
Merge pull request #3784 from ilya-lavrenov:nvidia_android
2015-03-05 06:43:03 +00:00
Vadim Pisarevsky
0b99f6bcd6
Merge pull request #3777 from ilya-lavrenov:nvidia_cvtcolor_eps
2015-03-04 13:53:41 +00:00
Ilya Lavrenov
cf4c79ebdd
disabled some kernels for Android && NVidia
2015-03-04 14:46:49 +03:00
Vadim Pisarevsky
ebac739a35
Merge pull request #3781 from Dmitry-Me:dangerousStringManipulation
2015-03-04 10:45:25 +00:00
Dmitry-Me
f8c454733b
Remove dangerous string manipulation, merge declaration with assignment
2015-03-04 10:35:06 +03:00