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
8f5c5a3c
Commit
8f5c5a3c
authored
Feb 14, 2015
by
Davis King
Browse files
Refined drectangle a little.
parent
53168ba4
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
29 additions
and
3 deletions
+29
-3
dlib/geometry/drectangle.h
dlib/geometry/drectangle.h
+4
-2
dlib/geometry/drectangle_abstract.h
dlib/geometry/drectangle_abstract.h
+1
-1
dlib/test/geometry.cpp
dlib/test/geometry.cpp
+24
-0
No files found.
dlib/geometry/drectangle.h
View file @
8f5c5a3c
...
@@ -95,7 +95,8 @@ namespace dlib
...
@@ -95,7 +95,8 @@ namespace dlib
double
width
(
double
width
(
)
const
)
const
{
{
if
(
is_empty
())
// if either the width or height would be 0.
if
(
t
>=
b
||
l
>=
r
)
return
0
;
return
0
;
else
else
return
r
-
l
;
return
r
-
l
;
...
@@ -104,7 +105,8 @@ namespace dlib
...
@@ -104,7 +105,8 @@ namespace dlib
double
height
(
double
height
(
)
const
)
const
{
{
if
(
is_empty
())
// if either the width or height would be 0.
if
(
t
>=
b
||
l
>=
r
)
return
0
;
return
0
;
else
else
return
b
-
t
;
return
b
-
t
;
...
...
dlib/geometry/drectangle_abstract.h
View file @
8f5c5a3c
...
@@ -95,7 +95,7 @@ namespace dlib
...
@@ -95,7 +95,7 @@ namespace dlib
- top() == rect.top()-0.5
- top() == rect.top()-0.5
- right() == rect.right()+0.5
- right() == rect.right()+0.5
- bottom() == rect.bottom()+0.5
- bottom() == rect.bottom()+0.5
- center(*this) == center(rect)
-
d
center(*this) ==
d
center(rect)
- width() == rect.width()
- width() == rect.width()
- height() == rect.height()
- height() == rect.height()
!*/
!*/
...
...
dlib/test/geometry.cpp
View file @
8f5c5a3c
...
@@ -772,6 +772,29 @@ namespace
...
@@ -772,6 +772,29 @@ namespace
}
}
}
}
// ----------------------------------------------------------------------------------------
void
test_rect_to_drect
()
{
print_spinner
();
dlib
::
rand
rnd
;
for
(
int
i
=
0
;
i
<
5000
;
++
i
)
{
rectangle
rect
=
centered_rect
(
rnd
.
get_random_32bit_number
()
%
100
,
rnd
.
get_random_32bit_number
()
%
100
,
rnd
.
get_random_32bit_number
()
%
100
,
rnd
.
get_random_32bit_number
()
%
100
);
drectangle
drect
=
rect
;
rectangle
rect2
=
drect
;
DLIB_TEST
(
rect2
==
rect
);
DLIB_TEST
(
rect
.
width
()
==
drect
.
width
());
DLIB_TEST
(
rect
.
height
()
==
drect
.
height
());
DLIB_TEST
(
dcenter
(
rect
)
==
dcenter
(
drect
));
}
}
// ----------------------------------------------------------------------------------------
// ----------------------------------------------------------------------------------------
class
geometry_tester
:
public
tester
class
geometry_tester
:
public
tester
...
@@ -786,6 +809,7 @@ namespace
...
@@ -786,6 +809,7 @@ namespace
void
perform_test
(
void
perform_test
(
)
)
{
{
test_rect_to_drect
();
geometry_test
();
geometry_test
();
test_border_enumerator
();
test_border_enumerator
();
test_find_affine_transform
();
test_find_affine_transform
();
...
...
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