Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
O
opencv
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
opencv
Commits
d9ab1d2b
Commit
d9ab1d2b
authored
Feb 09, 2011
by
Vadim Pisarevsky
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed build on Windows with MSVC2010
parent
0f1a047e
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
18 additions
and
11 deletions
+18
-11
test_arithm.cpp
modules/core/test/test_arithm.cpp
+9
-9
blobdetector.cpp
modules/features2d/src/blobdetector.cpp
+1
-0
test_canny.cpp
modules/imgproc/test/test_canny.cpp
+1
-1
ts.hpp
modules/ts/include/opencv2/ts/ts.hpp
+4
-0
precomp.hpp
modules/ts/src/precomp.hpp
+2
-0
ts.cpp
modules/ts/src/ts.cpp
+1
-1
No files found.
modules/core/test/test_arithm.cpp
View file @
d9ab1d2b
...
...
@@ -18,7 +18,7 @@ struct BaseElemWiseOp
BaseElemWiseOp
(
int
_ninputs
,
int
_flags
,
double
_alpha
,
double
_beta
,
Scalar
_gamma
=
Scalar
::
all
(
0
),
int
_context
=
1
)
:
ninputs
(
_ninputs
),
flags
(
_flags
),
alpha
(
_alpha
),
beta
(
_beta
),
gamma
(
_gamma
),
context
(
_context
)
{}
BaseElemWiseOp
()
{
flags
=
alpha
=
beta
=
0
;
gamma
=
Scalar
::
all
(
0
);
}
BaseElemWiseOp
()
{
flags
=
0
;
alpha
=
beta
=
0
;
gamma
=
Scalar
::
all
(
0
);
}
virtual
~
BaseElemWiseOp
()
{}
virtual
void
op
(
const
vector
<
Mat
>&
,
Mat
&
,
const
Mat
&
)
{}
virtual
void
refop
(
const
vector
<
Mat
>&
,
Mat
&
,
const
Mat
&
)
{}
...
...
@@ -288,7 +288,7 @@ struct LogicOp : public BaseElemWiseOp
else
cvtest
::
logicOp
(
src
[
0
],
src
[
1
],
dst
,
opcode
);
}
double
getMaxErr
(
int
depth
)
double
getMaxErr
(
int
)
{
return
0
;
}
...
...
@@ -339,7 +339,7 @@ struct MinOp : public BaseElemWiseOp
{
cvtest
::
min
(
src
[
0
],
src
[
1
],
dst
);
}
double
getMaxErr
(
int
depth
)
double
getMaxErr
(
int
)
{
return
0
;
}
...
...
@@ -356,7 +356,7 @@ struct MaxOp : public BaseElemWiseOp
{
cvtest
::
max
(
src
[
0
],
src
[
1
],
dst
);
}
double
getMaxErr
(
int
depth
)
double
getMaxErr
(
int
)
{
return
0
;
}
...
...
@@ -373,7 +373,7 @@ struct MinSOp : public BaseElemWiseOp
{
cvtest
::
min
(
src
[
0
],
gamma
[
0
],
dst
);
}
double
getMaxErr
(
int
depth
)
double
getMaxErr
(
int
)
{
return
0
;
}
...
...
@@ -390,7 +390,7 @@ struct MaxSOp : public BaseElemWiseOp
{
cvtest
::
max
(
src
[
0
],
gamma
[
0
],
dst
);
}
double
getMaxErr
(
int
depth
)
double
getMaxErr
(
int
)
{
return
0
;
}
...
...
@@ -482,7 +482,7 @@ struct SetOp : public BaseElemWiseOp
{
dst
.
setTo
(
gamma
,
mask
);
}
void
refop
(
const
vector
<
Mat
>&
src
,
Mat
&
dst
,
const
Mat
&
mask
)
void
refop
(
const
vector
<
Mat
>&
,
Mat
&
dst
,
const
Mat
&
mask
)
{
cvtest
::
set
(
dst
,
gamma
,
mask
);
}
...
...
@@ -808,7 +808,7 @@ struct FlipOp : public BaseElemWiseOp
{
cvtest
::
flip
(
src
[
0
],
dst
,
flipcode
);
}
void
generateScalars
(
int
depth
,
RNG
&
rng
)
void
generateScalars
(
int
,
RNG
&
rng
)
{
flipcode
=
rng
.
uniform
(
0
,
3
)
-
1
;
}
...
...
@@ -1291,7 +1291,7 @@ TEST_P(ElemWiseTest, accuracy)
ElemWiseOpPtr
op
=
GetParam
();
int
testIdx
=
0
;
RNG
rng
(
cvtest
::
ARITHM_RNG_SEED
);
RNG
rng
(
(
uint64
)
cvtest
::
ARITHM_RNG_SEED
);
for
(
testIdx
=
0
;
testIdx
<
cvtest
::
ARITHM_NTESTS
;
testIdx
++
)
{
vector
<
int
>
size
;
...
...
modules/features2d/src/blobdetector.cpp
View file @
d9ab1d2b
...
...
@@ -41,6 +41,7 @@
//M*/
#include "precomp.hpp"
#include <iterator>
//#define DEBUG_BLOB_DETECTOR
...
...
modules/imgproc/test/test_canny.cpp
View file @
d9ab1d2b
...
...
@@ -184,7 +184,7 @@ test_Canny( const Mat& src, Mat& dst,
int
dxval
=
dx
.
at
<
short
>
(
y
,
x
),
dyval
=
dy
.
at
<
short
>
(
y
,
x
);
mag
.
at
<
float
>
(
y
,
x
)
=
use_true_gradient
?
(
float
)
sqrt
((
double
)(
dxval
*
dxval
+
dyval
*
dyval
))
:
(
float
)(
fabs
(
dxval
)
+
fabs
(
dyval
));
(
float
)(
fabs
(
(
double
)
dxval
)
+
fabs
((
double
)
dyval
));
}
}
...
...
modules/ts/include/opencv2/ts/ts.hpp
View file @
d9ab1d2b
#ifndef __OPENCV_GTESTCV_HPP__
#define __OPENCV_GTESTCV_HPP__
#ifndef GTEST_CREATE_AS_SHARED_LIBRARY
#define GTEST_LINKED_AS_SHARED_LIBRARY 1
#endif
#include "opencv2/ts/ts_gtest.h"
#include "opencv2/core/core.hpp"
...
...
modules/ts/src/precomp.hpp
View file @
d9ab1d2b
#define GTEST_CREATE_AS_SHARED_LIBRARY 1
#include "opencv2/ts/ts.hpp"
#include "opencv2/core/core_c.h"
modules/ts/src/ts.cpp
View file @
d9ab1d2b
...
...
@@ -68,7 +68,7 @@ namespace cvtest
#if defined WIN32 || defined _WIN32 || defined WIN64 || defined _WIN64
#ifdef _MSC_VER
static
void
set
SEHTranslator
(
unsigned
int
/*u*/
,
EXCEPTION_POINTERS
*
pExp
)
static
void
SEHTranslator
(
unsigned
int
/*u*/
,
EXCEPTION_POINTERS
*
pExp
)
{
int
code
=
TS
::
FAIL_EXCEPTION
;
switch
(
pExp
->
ExceptionRecord
->
ExceptionCode
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment