Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
OpenDAS
dlib
Commits
71f78c1e
"tutorials/models/git@developer.sourcefind.cn:OpenDAS/dgl.git" did not exist on "56ffb650fedd1249daf4d76a8d32eb708bec0a3c"
Commit
71f78c1e
authored
Aug 27, 2017
by
Davis King
Browse files
Fixed compiler warnings
parent
88c1bf3b
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
4 deletions
+7
-4
dlib/image_transforms/image_pyramid.h
dlib/image_transforms/image_pyramid.h
+1
-1
dlib/image_transforms/interpolation.h
dlib/image_transforms/interpolation.h
+6
-3
No files found.
dlib/image_transforms/image_pyramid.h
View file @
71f78c1e
...
@@ -1045,7 +1045,7 @@ namespace dlib
...
@@ -1045,7 +1045,7 @@ namespace dlib
long
y
=
outer_padding
;
long
y
=
outer_padding
;
size_t
i
=
0
;
size_t
i
=
0
;
while
(
y
<
height
+
outer_padding
)
while
(
y
<
height
+
(
long
)
outer_padding
)
{
{
rectangle
rect
=
translate_rect
(
get_rect
(
pyramid
[
i
]),
point
(
outer_padding
,
y
));
rectangle
rect
=
translate_rect
(
get_rect
(
pyramid
[
i
]),
point
(
outer_padding
,
y
));
DLIB_ASSERT
(
get_rect
(
out_img
).
contains
(
rect
));
DLIB_ASSERT
(
get_rect
(
out_img
).
contains
(
rect
));
...
...
dlib/image_transforms/interpolation.h
View file @
71f78c1e
...
@@ -1306,7 +1306,8 @@ namespace dlib
...
@@ -1306,7 +1306,8 @@ namespace dlib
pyramid_type
pyr
;
pyramid_type
pyr
;
for
(
unsigned
long
i
=
0
;
i
<
images
.
size
();
++
i
)
for
(
unsigned
long
i
=
0
;
i
<
images
.
size
();
++
i
)
{
{
if
(
images
[
i
].
size
()
<=
max_image_size
)
const
unsigned
long
img_size
=
num_rows
(
images
[
i
])
*
num_columns
(
images
[
i
]);
if
(
img_size
<=
max_image_size
)
{
{
pyramid_up
(
images
[
i
],
temp
,
pyr
);
pyramid_up
(
images
[
i
],
temp
,
pyr
);
swap
(
temp
,
images
[
i
]);
swap
(
temp
,
images
[
i
]);
...
@@ -1340,7 +1341,8 @@ namespace dlib
...
@@ -1340,7 +1341,8 @@ namespace dlib
pyramid_type
pyr
;
pyramid_type
pyr
;
for
(
unsigned
long
i
=
0
;
i
<
images
.
size
();
++
i
)
for
(
unsigned
long
i
=
0
;
i
<
images
.
size
();
++
i
)
{
{
if
(
images
[
i
].
size
()
<=
max_image_size
)
const
unsigned
long
img_size
=
num_rows
(
images
[
i
])
*
num_columns
(
images
[
i
]);
if
(
img_size
<=
max_image_size
)
{
{
pyramid_up
(
images
[
i
],
temp
,
pyr
);
pyramid_up
(
images
[
i
],
temp
,
pyr
);
swap
(
temp
,
images
[
i
]);
swap
(
temp
,
images
[
i
]);
...
@@ -1377,7 +1379,8 @@ namespace dlib
...
@@ -1377,7 +1379,8 @@ namespace dlib
pyramid_type
pyr
;
pyramid_type
pyr
;
for
(
unsigned
long
i
=
0
;
i
<
images
.
size
();
++
i
)
for
(
unsigned
long
i
=
0
;
i
<
images
.
size
();
++
i
)
{
{
if
(
images
[
i
].
size
()
<=
max_image_size
)
const
unsigned
long
img_size
=
num_rows
(
images
[
i
])
*
num_columns
(
images
[
i
]);
if
(
img_size
<=
max_image_size
)
{
{
pyramid_up
(
images
[
i
],
temp
,
pyr
);
pyramid_up
(
images
[
i
],
temp
,
pyr
);
swap
(
temp
,
images
[
i
]);
swap
(
temp
,
images
[
i
]);
...
...
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