Andrey Kamaev
addf0309ec
Move cv::Size_
2013-04-01 15:24:32 +04:00
Andrey Kamaev
13b31b0804
Move C++ basic structures to separate header and inverse dependency from C API
...
cv::Complex, cv::Point_ and cv::Point3_ are moved.
2013-04-01 15:24:32 +04:00
Andrey Kamaev
19f8f85c51
Move C structures wrappers from core.hpp to core_c.h
...
Also move RTTIImpl class to the only usage
2013-04-01 15:24:32 +04:00
Andrey Kamaev
6bf49d49e7
Drop CvModule and cvSetMemoryManager
2013-04-01 15:24:32 +04:00
Andrey Kamaev
db45e04d58
Merge pull request #720 from taka-no-me:drop_sort
2013-04-01 15:14:45 +04:00
Andrey Kamaev
aebffb712a
Merge pull request #726 from jet47:fix-pvs-studio-warnings
2013-04-01 15:11:02 +04:00
Vladislav Vinogradov
ce2284e2e6
removed duplication
2013-04-01 11:29:13 +04:00
Vladislav Vinogradov
b28677bd90
fixed misprint in MatOp::augAssignXor
2013-04-01 11:16:47 +04:00
Andrey Kamaev
ea5225ef3e
Fix typo leading to heap corruption in OutputArray::create
2013-03-31 13:40:09 +04:00
Andrey Kamaev
f77a375354
Merge branch '2.4'
2013-03-29 19:38:35 +04:00
Ryan Rawson
f5c3cb8b7c
Update operations_on_arrays.rst
...
Remove weirdo unicode – and just use a normal -(cherry picked from commit 0d49de51b7
)
2013-03-29 18:29:29 +04:00
Andrey Kamaev
f4b98e9628
Merge pull request #719 from jet47:gpu-fix-build
2013-03-29 18:23:05 +04:00
Andrey Kamaev
0bb785c979
Merge pull request #717 from ryanobjc:patch-1
2013-03-29 18:21:59 +04:00
Andrey Kamaev
855acc9748
Add specialization for << operator for writing std::string to FileStorage
2013-03-29 16:27:12 +04:00
Andrey Kamaev
cc6bdfb045
Remove inline sorting algorithms from core headers
2013-03-28 17:22:50 +04:00
Vladislav Vinogradov
15f09f8068
fixed gpu module compilation
2013-03-28 11:48:43 +04:00
Alexander Smorkalov
09bc99a0c0
HAVE_WIN32UI and HAVE_VFW checks and defines added.
2013-03-27 08:03:51 -07:00
Ryan Rawson
0d49de51b7
Update operations_on_arrays.rst
...
Remove weirdo unicode – and just use a normal -
2013-03-27 02:52:53 -07:00
Alexander Smorkalov
6f68640d4d
Multiple fixes for WinRT
...
Fixed flann build with NEON;
Fixed Haming distance with NEON;
Honest cvRound for WinRT added;
cvRound test added;
Video IO with direct show disabled;
2013-03-26 17:19:52 -07:00
Andrey Kamaev
2edfae5070
Move documentation for cv::KeyPoint and cv::DMatch to core
2013-03-26 17:20:51 +04:00
Andrey Kamaev
49f6dad13f
Move cv::KeyPoint and cv::DMatch to core
2013-03-26 16:08:43 +04:00
Andrey Kamaev
8eff34ee0b
Merge pull request #709 from taka-no-me:cv_format
2013-03-26 14:36:47 +04:00
Andrey Kamaev
2107ea9773
More accurate implementation of cv::format
2013-03-26 11:54:04 +04:00
Andrey Kamaev
5fd58a0103
Fix std::string to cv::String migration problems in gpumat.cpp
2013-03-26 11:24:54 +04:00
Andrey Kamaev
aaf69c422e
Fix clang build for Android (CV_XADD)
2013-03-25 18:06:02 +04:00
Andrey Kamaev
deb7f4d474
Fix globbing failure when stat call fails
2013-03-25 17:38:50 +04:00
Andrey Kamaev
78a843e8ac
Move implementation of cv::String methods out of class definition
2013-03-25 16:01:23 +04:00
Andrey Kamaev
3d3385654a
Use C++ style includes when compiled as C++
2013-03-25 16:01:06 +04:00
Andrey Kamaev
bafd359083
Merge pull request #695 from taka-no-me/cv_str
...
cv::String to replace the std::string
2013-03-25 03:24:42 -07:00
marina.kolpakova
4096b54560
use static assertation where suitable
2013-03-25 00:29:12 +04:00
marina.kolpakova
5c1c13e745
static assert
2013-03-25 00:29:12 +04:00
Andrey Kamaev
33ef7990b0
Update documentation
2013-03-22 22:14:54 +04:00
Andrey Kamaev
be7bbe3aa9
Drop cv:: prefix from cv::String used inside the cv namespace
2013-03-22 22:14:50 +04:00
Andrey Kamaev
75513a46dc
Remove all include directives for <string>
2013-03-22 22:14:47 +04:00
Andrey Kamaev
3088808926
Fix build of various backends
2013-03-22 22:14:40 +04:00
Andrey Kamaev
762aefd71b
Compile opencv_test_core with cv::String instead of std::string
...
All tests passed!
2013-03-22 22:14:22 +04:00
Andrey Kamaev
14bb4cbe1e
Add cv::String class
2013-03-22 22:14:18 +04:00
Andrey Kamaev
82d7292ee7
Merge pull request #680 from vpisarev:c2cpp_video_take2
2013-03-22 19:34:53 +04:00
Andrey Kamaev
ec8aec09ec
Merge pull request #691 from vpisarev:fix_2899
2013-03-22 17:18:55 +04:00
Vadim Pisarevsky
a4815cf359
removed extra whitespaces
2013-03-22 15:12:55 +04:00
Vadim Pisarevsky
38693ef37c
fixed http://code.opencv.org/issues/2899
2013-03-22 15:10:54 +04:00
Vladislav Vinogradov
f0b19d4659
updated license header in whole gpu module
2013-03-22 14:03:15 +04:00
Andrey Kamaev
1ca8f33b4e
Merge branch '2.4'
2013-03-21 23:11:54 +04:00
Andrey Kamaev
2d764fe1c6
Merge pull request #665 from taka-no-me:core_utility
2013-03-21 14:47:49 +04:00
Jonathan Bohren
a7a0f92e58
Fixing segfault for near-zero-sized ellipses
2013-03-20 16:51:48 -04:00
Vadim Pisarevsky
07e0f7bf59
refactored video module; use the new-style algorithms now
2013-03-20 19:51:49 +04:00
Andrey Kamaev
89356ff16d
Move non-CV functionality from core.hpp to separate utility.hpp header
2013-03-20 17:56:06 +04:00
Vadim Pisarevsky
9a86245242
added test for bug #1448 and hopefully fixes the bug #2898
2013-03-20 11:58:19 +04:00
Anatoly Baksheev
08e55b7801
compilation for osx
2013-03-19 18:59:56 +04:00
cuda-geek
f768d8c93f
Merge pull request #658 from Nerei:affine3_classes
2013-03-18 13:36:01 +04:00
cuda-geek
f510b49cc2
Merge pull request #650 from taka-no-me:cvdef
2013-03-18 13:10:54 +04:00
Anatoly Baksheev
ceadaed108
Added Affine3<T> class
2013-03-18 11:51:43 +04:00
marina.kolpakova
92ba74a3ee
fix cuda
2013-03-17 05:50:45 +04:00
Andrey Kamaev
e75df56317
Unified handling of InputOutputArrays in Python wrapper generator
...
This makes arguments of type InputOutputArray required in python unless they
have a default value in C++.
As result following python functions changes signatures in non-trivial way:
* calcOpticalFlowFarneback
* calcOpticalFlowPyrLK
* calibrateCamera
* findContours
* findTransformECC
* floodFill
* kmeans
* PCACompute
* stereoCalibrate
And the following functions become return their modified inputs as a return
value:
* accumulate
* accumulateProduct
* accumulateSquare
* accumulateWeighted
* circle
* completeSymm
* cornerSubPix
* drawChessboardCorners
* drawContours
* drawDataMatrixCodes
* ellipse
* fillConvexPoly
* fillPoly
* filterSpeckles
* grabCut
* insertChannel
* line
* patchNaNs
* polylines
* randn
* randShuffle
* randu
* rectangle
* setIdentity
* updateMotionHistory
* validateDisparity
* watershed
2013-03-15 17:44:49 +04:00
Andrey Kamaev
a1c456b7c3
Extract common base header for C and C++ APIs
2013-03-15 10:38:38 +04:00
marina.kolpakova
157a98edf7
refactored cuda error handling; remove optional dependancies in soft cascade training app
2013-03-14 23:43:03 +04:00
marina.kolpakova
3c8e66d580
softcascade: remove device dependency on gpu
2013-03-14 12:28:01 +04:00
marina.kolpakova
6daf17f974
remove softcascade host dependencies on gpu module
2013-03-14 12:28:01 +04:00
Andrey Kamaev
d9cd753835
Merge pull request #645 from taka-no-me:bump_headers
2013-03-14 11:42:23 +04:00
Andrey Kamaev
b076b69e68
Merge pull request #642 from taka-no-me:fix1
2013-03-14 11:42:05 +04:00
Andrey Kamaev
a42a0f5fca
Added compatibility headers
2013-03-13 17:26:56 +04:00
Andrey Kamaev
ad5cddc007
Main module headers are moved 1 level up
...
e.g. <opencv2/core/core.hpp> become <opencv2/core.hpp>
Also renamed <opencv2/core/opengl_interop.hpp> to <opencv2/core/opengl.hpp>
2013-03-13 17:26:56 +04:00
Andrey Kamaev
55698548dd
Avoid assert in lapac.cpp if findHomography fails in BestOf2NearestMatcher::match
2013-03-12 22:49:40 +04:00
Andrey Kamaev
013fd9bf59
Make CV_XADD independent on STL and system headers
2013-03-12 20:32:41 +04:00
Andrey Kamaev
9f3ce0dd97
Reword and merge pull request #625 from jet47/gpu-fixes
2013-03-12 18:14:23 +04:00
Vladislav Vinogradov
ecb2ebfba4
Move opengl iterop code to cv::ogl namespace
...
Fixed issues: #2737 #2848
2013-03-12 18:13:11 +04:00
cuda-geek
e4f55a7ec0
Merge pull request #629 from cuda-geek:globbing
2013-03-12 15:57:56 +04:00
cuda_geek
61094d350b
add dlobbing for Windows
2013-03-09 23:21:17 +04:00
marina.kolpakova
a486aafe7c
add dlobbing under *nix
2013-03-09 21:10:45 +04:00
marina.kolpakova
12fe6ff734
add Mersenne Twister random number generator
2013-03-09 19:18:37 +04:00
cuda-geek
b9ab5939a4
Merge pull request #607 from cuda-geek:auto-compile-cuda
2013-03-05 13:50:29 +04:00
marina.kolpakova
19f863ec13
add possibility to create CUDA powered modules with ocv_define_module macro
2013-03-02 00:17:46 +04:00
Artanis
993522598b
Add implementations for Mat::zeros() and Mat::ones()
...
In class Mat, "static MatExpr Mat::zeros(int ndims, const int* sz, int
type)" and "static MatExpr Mat::ones(int ndims, const int* sz, int
type)" are declared but never implemented. That means we can see their
manuals from
"http://docs.opencv.org/modules/core/doc/basic_structures.html " but we
can't use them. Here I tried to finish their implementation.
I have also changed MatOp_Initializer::assign to make it support
multi-dimension Mat.
Test cases are added in test_math.cpp as well.
2013-03-01 13:18:44 +08:00
Andrey Kamaev
891d7da6ee
Merge branch '2.4'
2013-02-28 11:17:06 +04:00
Andrey Kamaev
ab221e94c0
Fix invert under MSVC
2013-02-26 11:16:57 +04:00
Andrey Kamaev
0d12f451be
Merge pull request #524 from LeonidBeynenson:add_float_and_unsigned_parameters_to_cv_algorithm
2013-02-26 01:00:55 +04:00
Vadim Pisarevsky
416432a8e5
replaced tabs with spaces
2013-02-25 23:10:38 +04:00
Vadim Pisarevsky
087537463d
attempt to make the ultimate fix for the failure in Core_Invert.small
2013-02-25 22:46:30 +04:00
Vadim Pisarevsky
25bbcba0ea
fixed Core_MulSpectrums failure
2013-02-25 22:02:24 +04:00
LeonidBeynenson
41dc829341
Made changes to avoid warnings (Windows compilation).
2013-02-25 15:38:59 +04:00
Andrey Kamaev
d586f4a103
Fix x64 build warnings
2013-02-25 15:04:19 +04:00
Andrey Kamaev
2a6fb2867e
Remove all using directives for STL namespace and members
...
Made all STL usages explicit to be able automatically find all usages of
particular class or function.
2013-02-25 15:04:17 +04:00
marina.kolpakova
ef6c236655
restore missed gpu functionality after merge #dddd285d
2013-02-24 22:14:57 +04:00
Andrey Kamaev
0b8a6da817
Merge branch '2.4'
2013-02-22 17:33:30 +04:00
LeonidBeynenson
bfb644ac04
Changed error message in Algorithm::get.
2013-02-21 20:10:42 +04:00
LeonidBeynenson
e7b214b6d2
Removed urequired functions
2013-02-21 19:49:37 +04:00
Vladislav Vinogradov
8b1f88c40f
updated gpu module API
2013-02-21 16:12:33 +04:00
Andrey Kamaev
afa993316f
Merge pull request #502 from jet47:opengl-updates
2013-02-21 15:12:43 +04:00
Andrey Kamaev
16461247ce
Merge pull request #498 from asmorkalov:doc_ptr
2013-02-21 13:30:34 +04:00
Vladislav Vinogradov
21f95a3b11
restored source compatibility
2013-02-21 12:38:12 +04:00
Andrey Kamaev
d4e7bec29a
Merge pull request #440 from AnnaKogan8:fixed-perfomance-tests
2013-02-21 12:29:57 +04:00
Andrey Kamaev
decf04dfec
Merge pull request #512 from jet47:core-gpu-updates
2013-02-21 12:22:04 +04:00
Vladislav Vinogradov
a938534a7e
restored binary compatibility
2013-02-21 12:18:08 +04:00
Alexander
4091eab45e
cv::Ptr description extended.
2013-02-21 12:14:42 +04:00
Vladislav Vinogradov
ce2559b332
optimized DeviceInfo class and ensureSizeIsEnough
2013-02-20 19:30:57 +04:00
Anna Kogan
a567c03fdf
Switched to TEST_CYCLE_MULTIRUN for fast tests
2013-02-20 17:05:54 +04:00
Andrey Kamaev
11bd936f0b
Fix warnings from documentation build
2013-02-20 15:07:13 +04:00
Andrey Kamaev
9498856b22
Fix documentation problems found by check_docs2 script
2013-02-20 15:07:13 +04:00
Andrey Kamaev
637397f621
Merge branch '2.4'
2013-02-20 12:31:16 +04:00
Andrey Kamaev
ff7b604a25
Fix several inconsistent declarations identified by check_doc2 script
2013-02-19 16:22:20 +04:00
Vladislav Vinogradov
e06c3ec7c5
updated OpenGL functionality:
...
* removed OpenGLFuncTab, now extensions are loaded internally
* added support of GlBuffer and GlTexture2D to InputArray/OutputArray
* added ELEMENT_ARRAY_BUFFER and PIXEL_PACK_BUFFER targets
* added copyFrom/copyTo method for GlBuffer and GlTexture2D
* removed GlFont
* removed pointCloudShow
* removed OpenGLCleanCallback
* added Access parameter to GlBuffer::mapHost
* added autoRelease parameter to all create methods
2013-02-19 14:13:11 +04:00
Vadim Pisarevsky
a1c7e0368c
fixed problem reported by Thouis (Ray) Jones
2013-02-18 17:01:21 +04:00
Andrey Kamaev
262fc929aa
Merge branch '2.4'
2013-02-18 15:35:42 +04:00
Andrey Kamaev
4cc3dfe27c
Merge pull request #482 from vpisarev:c2cpp_imgproc_part2
2013-02-14 20:13:45 +04:00
Daniil Osokin
5f32e0e24d
Rewrote doc for set-get number of threads functionality with support new frameworks (bug #2064 )
2013-02-14 17:11:16 +04:00
Daniil Osokin
6deda2531c
Fixed getNumThreads() for C=
2013-02-14 17:07:36 +04:00
Vadim Pisarevsky
78402bf596
made several minor fixes as pointed out by Andrey
2013-02-14 15:36:20 +04:00
Andrey Kamaev
956aa68fb5
Merge branch '2.4'
2013-02-12 20:30:17 +04:00
Andrey Kamaev
8b7a28a7e4
Merge pull request #477 from asmorkalov:android_version_info
2013-02-12 17:06:27 +04:00
Andrey Kamaev
7c77b402db
Merge pull request #468 from kirill-kornyakov:test-for-saturate-cast
2013-02-12 17:04:54 +04:00
Andrey Kamaev
b44b920997
Merge branch '2.4'
2013-02-12 16:30:18 +04:00
Alexander Smorkalov
1751a963f2
Build info output for all android apps added.
...
OpenCV build information output to logcat added to OpenCV initialization code;
Documenation for cv::getBuildInformation() added.
2013-02-12 11:19:05 +04:00
Andrey Kamaev
3990564a83
Merge pull request #470 from kirill-kornyakov:bug_2788_testing_add_method_for_column
2013-02-11 21:16:39 +04:00
Bo Li
92e7e7d8e8
fix issue 2788
2013-02-11 15:09:42 +01:00
Kirill Kornyakov
74e5650350
Reenabled second test
2013-02-11 16:53:41 +04:00
Kirill Kornyakov
7071bd63ab
Added two tests to highlight bug #2788
2013-02-11 15:25:15 +04:00
Kirill Kornyakov
81b9f9b16b
Added a test that documents that negative numbers are not clipped by cv::saturate_cast
2013-02-11 14:58:38 +04:00
Andrey Kamaev
ffb3b5ddbe
Adjust OpenCV version to 2.4.4
2013-02-11 14:17:29 +04:00
Andrey Kamaev
afe85e7e51
Fix some warnings from -O0 build
2013-02-06 20:57:36 +04:00
LeonidBeynenson
b85a098d9c
Added float, uint64, and uchar params to Algorithm
...
Made changes to work in cv::Algorithm with parameters of these types.
Also fixed SimpleBlobDetector -- now it can be created by
cv::Algorithm::create and it can work with cv::Algorithm::set/get.
2013-02-04 20:25:18 +04:00
Andrey Kamaev
c527340cb6
Merge branch 2.4
2013-02-04 17:15:55 +04:00
Andrey Kamaev
61079547f0
Merge branch '2.4'
2013-02-01 14:59:40 +04:00
Vadim Pisarevsky
51eba617a8
a part of PR269 (parallelization of several functions) by Alexander Mordvintsev
2013-02-01 14:01:44 +04:00
Andrey Kamaev
992d47e9dc
Merge pull request #400 from ilysenkov:bugfix_2560
2013-02-01 12:05:48 +04:00
Andrey Kamaev
57aa089ad6
Merge pull request #392 from vpisarev:python_fixes2
2013-02-01 10:20:52 +04:00
Ilya Lysenkov
b24e4bddb1
Documented the TermCriteria class ( #2560 )
2013-02-01 10:16:30 +04:00
Andrey Kamaev
a8c014de33
Merge pull request #318 from AnnaKogan8:fixed-perf-tests
2013-01-31 21:01:44 +04:00
Vadim Pisarevsky
54e0765d80
yet another minor fix in cv::transpose()
2013-01-31 20:26:16 +04:00
Vadim Pisarevsky
7ca38d63d9
fixed failure of the C++ test for estimateAffine3D
2013-01-31 19:44:16 +04:00
Daniil Osokin
fe5b9df45f
Fixed multiple issues in docs (bug #2410 )
2013-01-31 17:34:40 +04:00
Anna Kogan
ed4c687d45
Increased time limits, eliminated extra params
2013-01-31 16:18:52 +04:00
Andrey Kamaev
7572b4d400
Merge branch '2.4'
2013-01-30 15:12:50 +04:00
Andrey Kamaev
98fdd70466
Merge pull request #339 from vpisarev:core_fixes
2013-01-29 15:51:22 +04:00
Andrey Kamaev
78a338159d
Merge branch '2.4'
2013-01-29 14:17:13 +04:00
cuda-geek
04f01ed21d
Merge pull request #353 from asmaloney:arg_checks
2013-01-29 11:04:33 +04:00
Andy Maloney
7a6475c3f9
Check pointers before using them in var init
2013-01-28 16:51:28 -05:00
Vadim Pisarevsky
146ca61a27
added tests for #1373 , #2629 , #2719 ; fixed another bug in determinant(Matx<T,n,n>)
2013-01-28 17:27:08 +04:00
Vadim Pisarevsky
1df10553bb
fixed bugs #1373 , #2629 , #2719
2013-01-25 23:45:41 +04:00
Andrey Kamaev
f4e27bcbbc
Merge branch '2.4'
2013-01-25 16:30:36 +04:00
Andrey Kamaev
0487067964
Merge pull request #317 from vpisarev:c2cpp_refactor_imgproc
2013-01-24 13:03:34 +04:00
Vadim Pisarevsky
efd00238e2
fixed warnings; restored fixed_size parameter in AutoBuffer
2013-01-23 21:47:58 +04:00
Vladislav Vinogradov
395f0201e3
fixed build for CARMA:
...
- added CMake toolchain file
- added WITH_NVCUVID flag
2013-01-23 21:05:08 +04:00
Vladislav Vinogradov
281d036fcf
optimizations:
...
- new reduce implementation (with kepler optimizations)
- saturate_cast via asm command
- video SIMD instructions in element operations
- float arithmetics instead of double
- new deviceSupports function
2013-01-23 21:05:07 +04:00
Vladislav Vinogradov
ae6266e101
fixes for gpu module:
...
- fixed printCudaDeviceInfo for new CC
- fixed some compilation errors and warnings
- removed unset command from CMake script
- removed unused std imports
2013-01-23 21:05:06 +04:00
Andrey Kamaev
caa2c06e50
Quiet output of cv::error in Java tests
...
Introduced new Java API
void org.opencv.core.Core.setErrorVerbosity(boolean verbose)
used to suppress output to stderr from OpenCV's asserts
2013-01-23 18:08:09 +04:00
Andrey Kamaev
dda337bdf2
Merge pull request #303 from taka-no-me:fix_split_merge_test
2013-01-21 14:14:17 +04:00
Vadim Pisarevsky
c2241dccc5
converted fitline to C++, fixed Mat::checkVector().
2013-01-21 01:07:47 +04:00
Vadim Pisarevsky
c197a46e7e
removed rarely used fixed_size parameter from AutoBuffer type, added optional AutoBuffer* but to cvarrToMat in order to speedup CvSeq->Mat conversion; finished conversion of convex hull and related functions to C++
2013-01-20 00:58:51 +04:00
Andrey Kamaev
e3474878b6
Consistently use 4-digit library version
2013-01-18 14:57:55 +04:00
Andrey Kamaev
dc0788c864
Merge branch 2.4
2013-01-17 18:39:20 +04:00
Vadim Pisarevsky
e3941d0965
refactored approxpoly
2013-01-17 00:11:08 +04:00
Andrey Kamaev
ae5661d5dc
Fix random failures of Split and Merge tests
2013-01-16 17:55:27 +04:00
Alexander Smorkalov
8cb0343f4c
Documentation build warning fixes.
...
Invalid links and refences fixed.
SpaeseMat class documentation updated.
2013-01-14 17:58:27 +04:00
Vadim Pisarevsky
19229f2fa0
Merge pull request #253 from Nerei:smart_operators_for_smart_ptr
2013-01-10 20:35:22 +04:00
Andrey Kamaev
20c5a8788d
Weaken acceptance criteria in phase test
2013-01-10 17:12:14 +04:00
Anatoly Baksheev
a09b973c2e
Smart operators for smart Ptr (feature #2637 )
2013-01-07 22:33:12 +04:00
Andrey Kamaev
13b6a3a15e
Merge branch 2.4
2012-12-24 17:10:07 +04:00
Vladislav Vinogradov
5138b7d209
Merge branch 'master' into cuda-dev
2012-12-24 13:48:33 +04:00
Andrey Kamaev
02c7e221a3
Merge pull request #252 from taka-no-me:fix_stlport_build
2012-12-24 12:44:13 +04:00
Andrey Kamaev
c02179a765
Revert "_InputArray/_OutputArray destructors are temporary made non-virtual. Please, restore it after 2.4.3"
...
This reverts commit 4be7619ce4
.
2012-12-22 21:14:14 +04:00
Andrey Kamaev
f87987ed72
Honor multidimensional matrices in InputArray::total
2012-12-22 17:56:02 +04:00
Andrey Kamaev
9944282b09
Fix build with STLPort from NDK r8d
2012-12-22 00:59:56 +04:00
Andrey Kamaev
962884cdec
Merge branch 2.4
2012-12-21 17:58:48 +04:00
Andrey Kamaev
aaf779a3a2
Adjust OpenCV version to 2.4.3.2
2012-12-20 17:19:34 +04:00
takacsd
64f821908e
Add missing _WIN32 check in core/operations.hpp.
...
Fix a compilation error with MinGW gcc 4.7 with enabled C++11 support (-std=c++11).
Issue number: #2555
2012-12-20 11:28:16 +01:00
Alexander Smorkalov
dfa4b2fefa
Workaround for gcc overoptimization compiler bug.
2012-12-18 15:58:17 +04:00
Vladislav Vinogradov
0973e86d8a
fixed printShortCudaDeviceInfo for new CC
2012-12-18 13:56:21 +04:00
Vladislav Vinogradov
bac94f85c1
fixed printCudaDeviceInfo for 3.5 CC (Patch #2641 )
2012-12-18 13:50:19 +04:00
Vadim Pisarevsky
2508d8e2b4
Merge pull request #218 from taka-no-me:drop_utf16
2012-12-16 22:16:54 +04:00
Anatoly Baksheev
94c310fc14
added Ptr::operator==
2012-12-15 22:48:50 +04:00
Andrey Kamaev
f5cd20d80b
Merge branch 2.4
2012-12-14 14:46:41 +04:00
Vladislav Vinogradov
da93a1dab9
fixed build for CARMA platform
2012-12-13 13:49:32 +04:00
marina.kolpakova
a6c3ed5b36
Merge branch master into cuda-dev
2012-12-11 01:12:14 +04:00
Anatoly Baksheev
50946b59c1
minor device namespace refactor
2012-12-10 17:36:02 +04:00
Vladislav Vinogradov
5fe9bb717d
fixed build under linux with OpenGL
2012-12-10 11:05:51 +04:00
Andrey Kamaev
18e77d606c
Drop functions working with multibyte characters
2012-12-08 18:18:11 +04:00
Andrey Kamaev
7c6191ec11
Refactored run.py script and temporary file generation logic
...
* use OPENCV_TEMP_PATH environment variable on all platforms
* fix cleanup after OpenCV tests on Windows
* add --list flag to output names of all tests found
* do not override user-passed --perf_min_samples and --perf_force_samples
options by --check flag
* fix complier checks inside run.py
2012-12-08 15:43:23 +04:00
Vladislav Vinogradov
c6263eb253
fixed build with CUDA and witout OpenGL
2012-12-07 14:03:23 +04:00
Vladislav Vinogradov
b689eca8a0
fixed OpenGL tests
...
now create window only once per test case
2012-12-05 14:18:57 +04:00
Vladislav Vinogradov
06776b612c
fixed warnings
2012-12-03 13:27:20 +04:00
Vladislav Vinogradov
05d842bcd8
a bit more opengl refactoring:
...
* added Access parameter to GlBuffer::mapHost
* added autoRelease parameter to all create methods
* fixed indentation in gl_core_3_1
* minor improvments for opengl sample
2012-12-03 13:11:06 +04:00
Andrey Kamaev
e10ee89ec4
Merge branch 2.4
2012-11-30 19:54:24 +04:00
Vladislav Vinogradov
08fbf667f9
refactored opengl functionality
...
* removed OpenGLFuncTab, now extensions are loaded internally
* renamed GlTexture -> GlTexture2D
* added support of GlBuffer and GlTexture2D to InputArray/OutputArray
* added ELEMENT_ARRAY_BUFFER and PIXEL_PACK_BUFFER targets
* added copyFrom/copyTo method for GlBuffer and GlTexture2D
* removed GlFont
* removed pointCloudShow
* removed OpenGLCleanCallback
2012-11-30 17:35:28 +04:00
Andrey Kamaev
49c35fafc0
Adjust OpenCV version to 2.4.3.1
2012-11-30 14:33:28 +04:00
Andrey Kamaev
7e8fab0747
Merge pull request #195 from vpisarev/inv3x3_fix
...
now invert 3x3 on "bad" matrices works well on Windows
2012-11-29 01:27:27 -08:00
Vadim Pisarevsky
b57e801c04
now invert 3x3 on "bad" matrices works well on Windows
2012-11-28 23:05:51 +04:00
Anna Kogan
4e21f42714
increased time-limits
2012-11-28 18:17:33 +04:00
Anna Kogan
8877066846
increased time-limits
2012-11-28 18:17:33 +04:00
Vladislav Vinogradov
d2591704e8
Merge branch 'kepler-optimization' into cuda-dev
2012-11-27 16:34:45 +04:00
marina.kolpakova
1712d0930c
Merge origin/master into cuda-dev
2012-11-26 18:56:33 +04:00
Vladislav Vinogradov
f00efcfc59
added optimized deviceSupports function
2012-11-26 11:41:52 +04:00
Vladislav Vinogradov
a71ef7d67b
convertTo
2012-11-26 11:37:51 +04:00
Andrey Kamaev
7f542e391a
Merge branch 2.4
...
Conflicts:
android/service/engine/AndroidManifest.xml - use file from 2.4
modules/contrib/src/detection_based_tracker.cpp - move #include <pthread.h> as in 2.4
modules/java/android_test/src/org/opencv/test/OpenCVTestRunner.java - use file from 2.4
2012-11-20 19:12:00 +04:00
Andrey Kamaev
04481d9ef4
Fix Android build with clang compiler
2012-11-20 15:20:04 +04:00
Andrey Kamaev
9719ea93b6
Merge branch 2.4
2012-11-13 19:54:48 +04:00
Andrey Kamaev
5bc66ec8e4
Merge pull request #149 from taka-no-me/osx_warnings
2012-11-13 18:21:40 +04:00
Andrey Kamaev
8ba9289a2c
Merge pull request #146 from taka-no-me/win_opengl
2012-11-13 18:19:42 +04:00
Andrey Kamaev
4d6bdc1533
Merge pull request #145 from taka-no-me/vec_print
2012-11-13 18:18:48 +04:00
Vladislav Vinogradov
afff9cf716
Optimized buffers reuse in gpu module:
...
ensureSizeIsEnough now doesn't reallocate memory, if buffer is small submat of big matrix
fixed createContinous according new changes
2012-11-12 10:30:35 +04:00
Andrey Kamaev
a126532cb7
Fix OS X build warnings
2012-11-09 11:29:52 +04:00