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
7e50d3e5
Commit
7e50d3e5
authored
Mar 13, 2013
by
Andrey Kamaev
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed MSVC warnings
parent
55698548
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
9 additions
and
8 deletions
+9
-8
CMakeLists.txt
3rdparty/libwebp/CMakeLists.txt
+1
-0
grfmt_webp.cpp
modules/highgui/src/grfmt_webp.cpp
+1
-1
convhull.cpp
modules/imgproc/src/convhull.cpp
+4
-4
demosaicing.cpp
modules/imgproc/src/demosaicing.cpp
+1
-1
test_color.cpp
modules/imgproc/test/test_color.cpp
+1
-1
softcascade.cpp
modules/softcascade/src/softcascade.cpp
+1
-1
No files found.
3rdparty/libwebp/CMakeLists.txt
View file @
7e50d3e5
...
...
@@ -41,6 +41,7 @@ if(UNIX)
endif
()
ocv_warnings_disable
(
CMAKE_C_FLAGS -Wunused-variable -Wshadow
)
ocv_warnings_disable
(
CMAKE_C_FLAGS /wd4244 /wd4267
)
# vs2005
set_target_properties
(
${
WEBP_LIBRARY
}
PROPERTIES OUTPUT_NAME
${
WEBP_LIBRARY
}
...
...
modules/highgui/src/grfmt_webp.cpp
View file @
7e50d3e5
...
...
@@ -176,7 +176,7 @@ bool WebPEncoder::write(const Mat& img, const std::vector<int>& params)
const
Mat
*
image
=
&
img
;
Mat
temp
;
in
t
size
=
0
;
size_
t
size
=
0
;
bool
comp_lossless
=
true
;
int
quality
=
100
;
...
...
modules/imgproc/src/convhull.cpp
View file @
7e50d3e5
...
...
@@ -206,9 +206,9 @@ void convexHull( InputArray _points, OutputArray _hull, bool clockwise, bool ret
}
for
(
i
=
0
;
i
<
tl_count
-
1
;
i
++
)
hullbuf
[
nout
++
]
=
pointer
[
tl_stack
[
i
]]
-
data0
;
hullbuf
[
nout
++
]
=
int
(
pointer
[
tl_stack
[
i
]]
-
data0
)
;
for
(
i
=
tr_count
-
1
;
i
>
0
;
i
--
)
hullbuf
[
nout
++
]
=
pointer
[
tr_stack
[
i
]]
-
data0
;
hullbuf
[
nout
++
]
=
int
(
pointer
[
tr_stack
[
i
]]
-
data0
)
;
int
stop_idx
=
tr_count
>
2
?
tr_stack
[
1
]
:
tl_count
>
2
?
tl_stack
[
tl_count
-
2
]
:
-
1
;
// lower half
...
...
@@ -244,9 +244,9 @@ void convexHull( InputArray _points, OutputArray _hull, bool clockwise, bool ret
}
for
(
i
=
0
;
i
<
bl_count
-
1
;
i
++
)
hullbuf
[
nout
++
]
=
pointer
[
bl_stack
[
i
]]
-
data0
;
hullbuf
[
nout
++
]
=
int
(
pointer
[
bl_stack
[
i
]]
-
data0
)
;
for
(
i
=
br_count
-
1
;
i
>
0
;
i
--
)
hullbuf
[
nout
++
]
=
pointer
[
br_stack
[
i
]]
-
data0
;
hullbuf
[
nout
++
]
=
int
(
pointer
[
br_stack
[
i
]]
-
data0
)
;
}
if
(
!
returnPoints
)
...
...
modules/imgproc/src/demosaicing.cpp
View file @
7e50d3e5
...
...
@@ -316,7 +316,7 @@ public:
_mm_storel_epi64
((
__m128i
*
)(
dst
+
6
*
6
),
g1
);
}
return
bayer
-
(
bayer_end
-
width
);
return
int
(
bayer
-
(
bayer_end
-
width
)
);
}
bool
use_simd
;
...
...
modules/imgproc/test/test_color.cpp
View file @
7e50d3e5
...
...
@@ -1960,7 +1960,7 @@ static void test_Bayer2RGB_EdgeAware_8u(const Mat& src, Mat& dst, int code)
int
dcn
=
dst
.
channels
();
CV_Assert
(
dcn
==
3
);
int
step
=
src
.
step
;
int
step
=
(
int
)
src
.
step
;
const
uchar
*
S
=
src
.
ptr
<
uchar
>
(
1
)
+
1
;
uchar
*
D
=
dst
.
ptr
<
uchar
>
(
1
)
+
dcn
;
...
...
modules/softcascade/src/softcascade.cpp
View file @
7e50d3e5
...
...
@@ -53,7 +53,7 @@ namespace {
struct
SOctave
{
SOctave
(
const
int
i
,
const
cv
::
Size
&
origObjSize
,
const
cv
::
FileNode
&
fn
)
:
index
(
i
),
weaks
((
int
)
fn
[
SC_OCT_WEAKS
]),
scale
(
std
::
pow
(
2
,(
float
)
fn
[
SC_OCT_SCALE
])),
:
index
(
i
),
weaks
((
int
)
fn
[
SC_OCT_WEAKS
]),
scale
(
(
float
)
std
::
pow
(
2
,(
float
)
fn
[
SC_OCT_SCALE
])),
size
(
cvRound
(
origObjSize
.
width
*
scale
),
cvRound
(
origObjSize
.
height
*
scale
))
{}
int
index
;
...
...
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