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
3f477c1f
Commit
3f477c1f
authored
Dec 29, 2012
by
Davis King
Browse files
A minor change to avoid a warning from gcc 4.4
parent
e93639f1
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
4 deletions
+4
-4
dlib/gui_widgets/widgets.cpp
dlib/gui_widgets/widgets.cpp
+4
-4
No files found.
dlib/gui_widgets/widgets.cpp
View file @
3f477c1f
...
@@ -5951,13 +5951,13 @@ namespace dlib
...
@@ -5951,13 +5951,13 @@ namespace dlib
if (overlay_rects[i].label.size() != 0)
if (overlay_rects[i].label.size() != 0)
{
{
// make a rectangle that is at the spot we want to draw our string
// make a rectangle that is at the spot we want to draw our string
rectangle
r
(
orect
.
br_corner
(),
rectangle r(orect.br_corner(), c.br_corner());
orect
.
br_corner
()
+
point
(
10000
,
10000
));
mfont->draw_string(c, r, overlay_rects[i].label, overlay_rects[i].color, 0,
mfont->draw_string(c, r, overlay_rects[i].label, overlay_rects[i].color, 0,
std::string::npos, area);
std::string::npos, area);
}
}
// draw circles for each "part" in this overlay rectangle.
std::map<std::string,point>::const_iterator itr;
std::map<std::string,point>::const_iterator itr;
for (itr = overlay_rects[i].parts.begin(); itr != overlay_rects[i].parts.end(); ++itr)
for (itr = overlay_rects[i].parts.begin(); itr != overlay_rects[i].parts.end(); ++itr)
{
{
...
@@ -5975,7 +5975,7 @@ namespace dlib
...
@@ -5975,7 +5975,7 @@ namespace dlib
// make a rectangle that is at the spot we want to draw our string
// make a rectangle that is at the spot we want to draw our string
rectangle r((temp.br_corner() + temp.bl_corner())/2,
rectangle r((temp.br_corner() + temp.bl_corner())/2,
temp
.
br_corner
()
+
point
(
10000
,
10000
)
);
c
.br_corner());
mfont->draw_string(c, r, itr->first, overlay_rects[i].color, 0,
mfont->draw_string(c, r, itr->first, overlay_rects[i].color, 0,
std::string::npos, area);
std::string::npos, area);
}
}
...
@@ -6005,7 +6005,7 @@ namespace dlib
...
@@ -6005,7 +6005,7 @@ namespace dlib
const point temp = center + point(0,radius);
const point temp = center + point(0,radius);
// make a rectangle that is at the spot we want to draw our string
// make a rectangle that is at the spot we want to draw our string
rectangle
r
(
temp
,
temp
+
point
(
10000
,
10000
));
rectangle r(temp,
c.br_corner(
));
mfont->draw_string(c, r, overlay_circles[i].label, overlay_circles[i].color, 0,
mfont->draw_string(c, r, overlay_circles[i].label, overlay_circles[i].color, 0,
std::string::npos, area);
std::string::npos, area);
}
}
...
...
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