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
01c1003d
Commit
01c1003d
authored
Nov 26, 2010
by
Vadim Pisarevsky
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed warnings and errors reported by VS2010
parent
1618ed0a
Show whitespace changes
Inline
Side-by-side
Showing
15 changed files
with
24 additions
and
17 deletions
+24
-17
features2d.hpp
modules/features2d/include/opencv2/features2d/features2d.hpp
+1
-1
compat.cpp
modules/legacy/src/compat.cpp
+2
-2
delaunay.c
samples/c/delaunay.c
+3
-1
demhist.c
samples/c/demhist.c
+3
-1
distrans.c
samples/c/distrans.c
+3
-1
edge.c
samples/c/edge.c
+1
-1
ffilldemo.c
samples/c/ffilldemo.c
+1
-1
houghlines.c
samples/c/houghlines.c
+1
-1
morphology.c
samples/c/morphology.c
+3
-1
peopledetect.cpp
samples/c/peopledetect.cpp
+0
-1
squares.c
samples/c/squares.c
+1
-1
brief_match_test.cpp
samples/cpp/brief_match_test.cpp
+2
-2
build3dmodel.cpp
samples/cpp/build3dmodel.cpp
+1
-1
contours2.cpp
samples/cpp/contours2.cpp
+1
-1
starter_video.cpp
samples/cpp/starter_video.cpp
+1
-1
No files found.
modules/features2d/include/opencv2/features2d/features2d.hpp
View file @
01c1003d
...
...
@@ -1803,7 +1803,7 @@ struct CV_EXPORTS L2
ResultType
result
=
ResultType
();
for
(
int
i
=
0
;
i
<
size
;
i
++
)
{
ResultType
diff
=
a
[
i
]
-
b
[
i
]
;
ResultType
diff
=
(
ResultType
)(
a
[
i
]
-
b
[
i
])
;
result
+=
diff
*
diff
;
}
return
(
ResultType
)
sqrt
((
double
)
result
);
...
...
modules/legacy/src/compat.cpp
View file @
01c1003d
...
...
@@ -573,7 +573,7 @@ void cvCalibrateCamera_64d( int image_count, int* _point_counts,
/* Find 3d position of object given intrinsic camera parameters,
3d model of the object and projection of the object into view plane */
void
cvFindExtrinsicCameraParams
(
int
point_count
,
CvSize
image_size
,
CvPoint2D32f
*
_image_points
,
CvSize
,
CvPoint2D32f
*
_image_points
,
CvPoint3D32f
*
_object_points
,
float
*
focal_length
,
CvPoint2D32f
principal_point
,
float
*
_distortion_coeffs
,
float
*
_rotation_vector
,
float
*
_translation_vector
)
...
...
@@ -598,7 +598,7 @@ void cvFindExtrinsicCameraParams( int point_count,
/* Variant of the previous function that takes double-precision parameters */
void
cvFindExtrinsicCameraParams_64d
(
int
point_count
,
CvSize
image_size
,
CvPoint2D64f
*
_image_points
,
CvSize
,
CvPoint2D64f
*
_image_points
,
CvPoint3D64f
*
_object_points
,
double
*
focal_length
,
CvPoint2D64f
principal_point
,
double
*
_distortion_coeffs
,
double
*
_rotation_vector
,
double
*
_translation_vector
)
...
...
samples/c/delaunay.c
View file @
01c1003d
#include <opencv2/imgproc/imgproc
.hpp
>
#include <opencv2/imgproc/imgproc
_c.h
>
#include <opencv2/highgui/highgui.hpp>
#include <stdio.h>
/* the script demostrates iterative construction of
delaunay triangulation and voronoi tesselation */
...
...
samples/c/demhist.c
View file @
01c1003d
#include <opencv2/imgproc/imgproc
.hpp
>
#include <opencv2/imgproc/imgproc
_c.h
>
#include <opencv2/highgui/highgui.hpp>
#include <stdio.h>
char
file_name
[]
=
"baboon.jpg"
;
int
_brightness
=
100
;
...
...
samples/c/distrans.c
View file @
01c1003d
#include <opencv2/imgproc/imgproc
.hpp
>
#include <opencv2/imgproc/imgproc
_c.h
>
#include <opencv2/highgui/highgui.hpp>
#include <stdio.h>
char
wndname
[]
=
"Distance transform"
;
char
tbarname
[]
=
"Threshold"
;
int
mask_size
=
CV_DIST_MASK_5
;
...
...
samples/c/edge.c
View file @
01c1003d
#include <opencv2/imgproc/imgproc
.hpp
>
#include <opencv2/imgproc/imgproc
_c.h
>
#include <opencv2/highgui/highgui.hpp>
char
wndname
[]
=
"Edge"
;
...
...
samples/c/ffilldemo.c
View file @
01c1003d
#include <opencv2/imgproc/imgproc
.hpp
>
#include <opencv2/imgproc/imgproc
_c.h
>
#include <opencv2/highgui/highgui.hpp>
IplImage
*
color_img0
;
...
...
samples/c/houghlines.c
View file @
01c1003d
#include "opencv2/highgui/highgui.hpp"
#include "opencv2/imgproc/imgproc
.hpp
"
#include "opencv2/imgproc/imgproc
_c.h
"
int
main
(
int
argc
,
char
**
argv
)
{
...
...
samples/c/morphology.c
View file @
01c1003d
#include "opencv2/highgui/highgui.hpp"
#include "opencv2/imgproc/imgproc.hpp"
#include "opencv2/imgproc/imgproc_c.h"
#include <stdio.h>
IplImage
*
src
=
0
;
IplImage
*
dst
=
0
;
...
...
samples/c/peopledetect.cpp
View file @
01c1003d
...
...
@@ -67,7 +67,6 @@ int main(int argc, char** argv)
// run the detector with default parameters. to get a higher hit-rate
// (and more false alarms, respectively), decrease the hitThreshold and
// groupThreshold (set groupThreshold to 0 to turn off the grouping completely).
int
can
=
img
.
channels
();
hog
.
detectMultiScale
(
img
,
found
,
0
,
Size
(
8
,
8
),
Size
(
32
,
32
),
1.05
,
2
);
t
=
(
double
)
getTickCount
()
-
t
;
printf
(
"tdetection time = %gms
\n
"
,
t
*
1000.
/
cv
::
getTickFrequency
());
...
...
samples/c/squares.c
View file @
01c1003d
...
...
@@ -3,7 +3,7 @@
// It loads several images subsequentally and tries to find squares in
// each image
//
#include "opencv2/imgproc/imgproc
.hpp
"
#include "opencv2/imgproc/imgproc
_c.h
"
#include "opencv2/highgui/highgui.hpp"
#include <stdio.h>
#include <math.h>
...
...
samples/cpp/brief_match_test.cpp
View file @
01c1003d
...
...
@@ -44,7 +44,7 @@ void matches2points(const vector<DMatch>& matches, const vector<KeyPoint>& kpts_
}
float
match
(
const
vector
<
KeyPoint
>&
kpts_train
,
const
vector
<
KeyPoint
>&
kpts_query
,
DescriptorMatcher
&
matcher
,
double
match
(
const
vector
<
KeyPoint
>&
kpts_train
,
const
vector
<
KeyPoint
>&
kpts_query
,
DescriptorMatcher
&
matcher
,
const
Mat
&
train
,
const
Mat
&
query
,
vector
<
DMatch
>&
matches
)
{
...
...
@@ -112,7 +112,7 @@ int main(int ac, char ** av)
cout
<<
"matching with BruteForceMatcher<Hamming>"
<<
endl
;
BruteForceMatcher
<
Hamming
>
matcher_popcount
;
vector
<
DMatch
>
matches_popcount
;
float
pop_time
=
match
(
kpts_1
,
kpts_2
,
matcher_popcount
,
desc_1
,
desc_2
,
matches_popcount
);
double
pop_time
=
match
(
kpts_1
,
kpts_2
,
matcher_popcount
,
desc_1
,
desc_2
,
matches_popcount
);
cout
<<
"done BruteForceMatcher<Hamming> matching. took "
<<
pop_time
<<
" seconds"
<<
endl
;
vector
<
Point2f
>
mpts_1
,
mpts_2
;
...
...
samples/cpp/build3dmodel.cpp
View file @
01c1003d
...
...
@@ -371,7 +371,7 @@ struct EqKeypoints
static
void
build3dmodel
(
const
Ptr
<
FeatureDetector
>&
detector
,
const
Ptr
<
DescriptorExtractor
>&
descriptorExtractor
,
const
vector
<
Point3f
>&
modelBox
,
const
vector
<
Point3f
>&
/*modelBox*/
,
const
vector
<
string
>&
imageList
,
const
vector
<
Rect
>&
roiList
,
const
vector
<
Vec6f
>&
poseList
,
...
...
samples/cpp/contours2.cpp
View file @
01c1003d
...
...
@@ -33,7 +33,7 @@ void on_trackbar(int, void*)
imshow
(
"contours"
,
cnt_img
);
}
int
main
(
int
argc
,
char
**
argv
)
int
main
(
int
argc
,
char
**
)
{
Mat
img
=
Mat
::
zeros
(
w
,
w
,
CV_8UC1
);
if
(
argc
>
1
)
...
...
samples/cpp/starter_video.cpp
View file @
01c1003d
...
...
@@ -35,7 +35,7 @@ int process(VideoCapture& capture) {
if
(
frame
.
empty
())
continue
;
imshow
(
window_name
,
frame
);
char
key
=
waitKey
(
5
);
//delay N millis, usually long enough to display and capture input
char
key
=
(
char
)
waitKey
(
5
);
//delay N millis, usually long enough to display and capture input
switch
(
key
)
{
case
'q'
:
case
'Q'
:
...
...
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