third_party/opencv
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/3.4' into merge-3.4

Browse Source
This commit is contained in:
Alexander Alekhin
2019-06-07 19:02:55 +03:00
parent f3de2b4be7 254f88f805
commit ddcf388270
43 changed files with 446 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/core/src/datastructs.cpp
+1 -1
View File
@@ -3368,7 +3368,7 @@ cvTreeToNodeSeq( const void* first, int header_size, CvMemStorage* storage )
typedef struct CvTreeNode
{
int flags; /* micsellaneous flags */
int flags; /* miscellaneous flags */
int header_size; /* size of sequence header */
struct CvTreeNode* h_prev; /* previous sequence */
struct CvTreeNode* h_next; /* next sequence */
modules/core/src/mathfuncs_core.simd.hpp
+1 -1
View File
@@ -422,7 +422,7 @@ void log64f(const double *src, double *dst, int n)
#define EXPPOLY_32F_A0 .9670371139572337719125840413672004409288e-2
// the code below uses _mm_cast* intrinsics, which are not avialable on VS2005
// the code below uses _mm_cast* intrinsics, which are not available on VS2005
#if (defined _MSC_VER && _MSC_VER < 1500) || \
(!defined __APPLE__ && defined __GNUC__ && __GNUC__*100 + __GNUC_MINOR__ < 402)
#undef CV_SSE2