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
2d0d3c9e
Commit
2d0d3c9e
authored
Aug 14, 2011
by
Davis King
Browse files
Added a global operator+ for rectangle+point to make this kind of operation
compile in more contexts.
parent
d1dc0e1d
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
47 additions
and
0 deletions
+47
-0
dlib/geometry/rectangle.h
dlib/geometry/rectangle.h
+20
-0
dlib/geometry/rectangle_abstract.h
dlib/geometry/rectangle_abstract.h
+24
-0
dlib/test/geometry.cpp
dlib/test/geometry.cpp
+3
-0
No files found.
dlib/geometry/rectangle.h
View file @
2d0d3c9e
...
@@ -541,6 +541,26 @@ namespace dlib
...
@@ -541,6 +541,26 @@ namespace dlib
return
rectangle
(
0
,
0
,
m
.
nc
()
-
1
,
m
.
nr
()
-
1
);
return
rectangle
(
0
,
0
,
m
.
nc
()
-
1
,
m
.
nr
()
-
1
);
}
}
// ----------------------------------------------------------------------------------------
inline
rectangle
operator
+
(
const
rectangle
&
r
,
const
point
&
p
)
{
return
r
+
rectangle
(
p
);
}
// ----------------------------------------------------------------------------------------
inline
rectangle
operator
+
(
const
point
&
p
,
const
rectangle
&
r
)
{
return
r
+
rectangle
(
p
);
}
// ----------------------------------------------------------------------------------------
// ----------------------------------------------------------------------------------------
}
}
...
...
dlib/geometry/rectangle_abstract.h
View file @
2d0d3c9e
...
@@ -636,6 +636,30 @@ namespace dlib
...
@@ -636,6 +636,30 @@ namespace dlib
bounding rectangle for that gridded object.)
bounding rectangle for that gridded object.)
!*/
!*/
// ----------------------------------------------------------------------------------------
inline
rectangle
operator
+
(
const
rectangle
&
r
,
const
point
&
p
);
/*!
ensures
- returns r + rectangle(p)
(i.e. returns the rectangle that contains both r and p)
!*/
// ----------------------------------------------------------------------------------------
inline
rectangle
operator
+
(
const
point
&
p
,
const
rectangle
&
r
);
/*!
ensures
- returns r + rectangle(p)
(i.e. returns the rectangle that contains both r and p)
!*/
// ----------------------------------------------------------------------------------------
// ----------------------------------------------------------------------------------------
}
}
...
...
dlib/test/geometry.cpp
View file @
2d0d3c9e
...
@@ -346,6 +346,9 @@ namespace
...
@@ -346,6 +346,9 @@ namespace
}
}
DLIB_TEST
(
rectangle
()
+
point
(
5
,
4
)
+
point
(
10
,
10
)
==
rectangle
(
5
,
4
,
10
,
10
));
}
}
...
...
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