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
fcd2a0c3
Commit
fcd2a0c3
authored
Jun 06, 2011
by
Vadim Pisarevsky
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed VS2010 compile warnings and errors
parent
0c877f62
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
16 additions
and
16 deletions
+16
-16
calib3d.hpp
modules/calib3d/include/opencv2/calib3d/calib3d.hpp
+1
-1
persistence.cpp
modules/core/src/persistence.cpp
+2
-2
orb.cpp
modules/features2d/src/orb.cpp
+1
-1
sift.cpp
modules/features2d/src/sift.cpp
+1
-1
color.cpp
modules/imgproc/src/color.cpp
+8
-8
bgfg_gaussmix2.cpp
modules/video/src/bgfg_gaussmix2.cpp
+2
-2
video_homography.cpp
samples/cpp/video_homography.cpp
+1
-1
No files found.
modules/calib3d/include/opencv2/calib3d/calib3d.hpp
View file @
fcd2a0c3
...
...
@@ -730,7 +730,7 @@ protected:
//! filters off speckles (small regions of incorrectly computed disparity)
CV_EXPORTS_W
void
filterSpeckles
(
InputOutputArray
img
,
double
newVal
,
int
maxSpeckleSize
,
double
maxDiff
,
InputOutputArray
buf
=
InputOutputArray
()
);
InputOutputArray
buf
=
None
()
);
//! computes valid disparity ROI from the valid ROIs of the rectified images (that are returned by cv::stereoRectify())
CV_EXPORTS_W
Rect
getValidDisparityROI
(
Rect
roi1
,
Rect
roi2
,
...
...
modules/core/src/persistence.cpp
View file @
fcd2a0c3
...
...
@@ -1424,9 +1424,9 @@ icvYMLWrite( CvFileStorage* fs, const char* key, const char* data )
for
(
i
=
0
;
i
<
keylen
;
i
++
)
{
int
c
=
key
[
i
];
char
c
=
key
[
i
];
ptr
[
i
]
=
(
char
)
c
;
ptr
[
i
]
=
c
;
if
(
!
cv_isalnum
(
c
)
&&
c
!=
'-'
&&
c
!=
'_'
&&
c
!=
' '
)
CV_Error
(
CV_StsBadArg
,
"Key names may only contain alphanumeric characters [a-zA-Z0-9], '-', '_' and ' '"
);
}
...
...
modules/features2d/src/orb.cpp
View file @
fcd2a0c3
...
...
@@ -469,7 +469,7 @@ ORB::ORB(size_t n_features, const CommonParams & detector_params) :
params_
(
detector_params
),
n_features_
(
n_features
)
{
// fill the extractors and descriptors for the corresponding scales
float
factor
=
1.0
/
params_
.
scale_factor_
/
params_
.
scale_factor_
;
float
factor
=
(
float
)(
1.0
/
params_
.
scale_factor_
/
params_
.
scale_factor_
)
;
int
n_desired_features_per_scale
=
cvRound
(
n_features
/
((
std
::
pow
(
factor
,
int
(
params_
.
n_levels_
))
-
1
)
/
(
factor
-
1
)));
n_features_per_level_
.
resize
(
detector_params
.
n_levels_
);
...
...
modules/features2d/src/sift.cpp
View file @
fcd2a0c3
...
...
@@ -637,7 +637,7 @@ static struct feature* interp_extremum( IplImage*** dog_pyr, int octv,
{
struct
feature
*
feat
;
struct
detection_data
*
ddata
;
double
xi
,
xr
,
xc
,
contr
;
double
xi
=
0
,
xr
=
0
,
xc
=
0
,
contr
;
int
i
=
0
;
while
(
i
<
SIFT_MAX_INTERP_STEPS
)
...
...
modules/imgproc/src/color.cpp
View file @
fcd2a0c3
...
...
@@ -2653,12 +2653,12 @@ static void Bayer2RGB_VNG_8u( const Mat& srcmat, Mat& dstmat, int code )
template
<
int
R
>
struct
YUV420i2BGR888Invoker
{
Mat
&
dst
;
Mat
*
dst
;
const
uchar
*
my1
,
*
muv
;
int
width
;
YUV420i2BGR888Invoker
(
Mat
&
_dst
,
int
_width
,
const
uchar
*
_y1
,
const
uchar
*
_uv
)
:
dst
(
_dst
),
my1
(
_y1
),
muv
(
_uv
),
width
(
_width
)
{}
:
dst
(
&
_dst
),
my1
(
_y1
),
muv
(
_uv
),
width
(
_width
)
{}
void
operator
()(
const
BlockedRange
&
range
)
const
{
...
...
@@ -2670,8 +2670,8 @@ struct YUV420i2BGR888Invoker
for
(
int
j
=
range
.
begin
();
j
<
range
.
end
();
j
+=
2
,
y1
+=
width
*
2
,
uv
+=
width
)
{
uchar
*
row1
=
dst
.
ptr
<
uchar
>
(
j
);
uchar
*
row2
=
dst
.
ptr
<
uchar
>
(
j
+
1
);
uchar
*
row1
=
dst
->
ptr
<
uchar
>
(
j
);
uchar
*
row2
=
dst
->
ptr
<
uchar
>
(
j
+
1
);
const
uchar
*
y2
=
y1
+
width
;
for
(
int
i
=
0
;
i
<
width
;
i
+=
2
,
row1
+=
6
,
row2
+=
6
)
...
...
@@ -2710,12 +2710,12 @@ struct YUV420i2BGR888Invoker
template
<
int
R
>
struct
YUV420i2BGRA8888Invoker
{
Mat
&
dst
;
Mat
*
dst
;
const
uchar
*
my1
,
*
muv
;
int
width
;
YUV420i2BGRA8888Invoker
(
Mat
&
_dst
,
int
_width
,
const
uchar
*
_y1
,
const
uchar
*
_uv
)
:
dst
(
_dst
),
my1
(
_y1
),
muv
(
_uv
),
width
(
_width
)
{}
:
dst
(
&
_dst
),
my1
(
_y1
),
muv
(
_uv
),
width
(
_width
)
{}
void
operator
()(
const
BlockedRange
&
range
)
const
{
...
...
@@ -2727,8 +2727,8 @@ struct YUV420i2BGRA8888Invoker
for
(
int
j
=
range
.
begin
();
j
<
range
.
end
();
j
+=
2
,
y1
+=
width
*
2
,
uv
+=
width
)
{
uchar
*
row1
=
dst
.
ptr
<
uchar
>
(
j
);
uchar
*
row2
=
dst
.
ptr
<
uchar
>
(
j
+
1
);
uchar
*
row1
=
dst
->
ptr
<
uchar
>
(
j
);
uchar
*
row2
=
dst
->
ptr
<
uchar
>
(
j
+
1
);
const
uchar
*
y2
=
y1
+
width
;
for
(
int
i
=
0
;
i
<
width
;
i
+=
2
,
row1
+=
8
,
row2
+=
8
)
...
...
modules/video/src/bgfg_gaussmix2.cpp
View file @
fcd2a0c3
...
...
@@ -1320,7 +1320,7 @@ void BackgroundSubtractorMOG2::getBackgroundImage(OutputArray backgroundImage) c
break
;
}
Vec3f
val
=
Vec3f
(
meanVal
[
0
],
meanVal
[
1
],
meanVal
[
2
])
*
(
1.0
/
totalWeight
);
Vec3f
val
=
Vec3f
(
(
float
)
meanVal
[
0
],
(
float
)
meanVal
[
1
],
(
float
)
meanVal
[
2
])
*
(
float
)
(
1.0
/
totalWeight
);
meanBackground
.
at
<
Vec3b
>
(
row
,
col
)
=
Vec3b
(
val
);
firstGaussianIdx
+=
nmixtures
;
}
...
...
@@ -1343,7 +1343,7 @@ void BackgroundSubtractorMOG2::getBackgroundImage(OutputArray backgroundImage) c
}
default
:
CV_
Assert
(
false
);
CV_
Error
(
CV_StsUnsupportedFormat
,
""
);
}
}
...
...
samples/cpp/video_homography.cpp
View file @
fcd2a0c3
...
...
@@ -160,7 +160,7 @@ int main(int ac, char ** av)
{
capture
>>
frame
;
if
(
frame
.
empty
())
continue
;
break
;
cvtColor
(
frame
,
gray
,
CV_RGB2GRAY
);
...
...
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