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
2fef9dcc
Commit
2fef9dcc
authored
Nov 02, 2013
by
Davis King
Browse files
Added std:: to some functions to avoid potential ambiguity.
parent
e3f055a1
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
5 deletions
+5
-5
dlib/pixel.h
dlib/pixel.h
+5
-5
No files found.
dlib/pixel.h
View file @
2fef9dcc
...
@@ -699,8 +699,8 @@ namespace dlib
...
@@ -699,8 +699,8 @@ namespace dlib
HSL
c2
;
HSL
c2
;
using
namespace
std
;
using
namespace
std
;
themin
=
min
(
c1
.
r
,
min
(
c1
.
g
,
c1
.
b
));
themin
=
std
::
min
(
c1
.
r
,
std
::
min
(
c1
.
g
,
c1
.
b
));
themax
=
max
(
c1
.
r
,
max
(
c1
.
g
,
c1
.
b
));
themax
=
std
::
max
(
c1
.
r
,
std
::
max
(
c1
.
g
,
c1
.
b
));
delta
=
themax
-
themin
;
delta
=
themax
-
themin
;
c2
.
l
=
(
themin
+
themax
)
/
2
;
c2
.
l
=
(
themin
+
themax
)
/
2
;
c2
.
s
=
0
;
c2
.
s
=
0
;
...
@@ -743,9 +743,9 @@ namespace dlib
...
@@ -743,9 +743,9 @@ namespace dlib
sat
.
g
=
0
;
sat
.
g
=
0
;
sat
.
b
=
(
360
-
c1
.
h
)
/
60.0
;
sat
.
b
=
(
360
-
c1
.
h
)
/
60.0
;
}
}
sat
.
r
=
min
(
sat
.
r
,
1.0
);
sat
.
r
=
std
::
min
(
sat
.
r
,
1.0
);
sat
.
g
=
min
(
sat
.
g
,
1.0
);
sat
.
g
=
std
::
min
(
sat
.
g
,
1.0
);
sat
.
b
=
min
(
sat
.
b
,
1.0
);
sat
.
b
=
std
::
min
(
sat
.
b
,
1.0
);
ctmp
.
r
=
2
*
c1
.
s
*
sat
.
r
+
(
1
-
c1
.
s
);
ctmp
.
r
=
2
*
c1
.
s
*
sat
.
r
+
(
1
-
c1
.
s
);
ctmp
.
g
=
2
*
c1
.
s
*
sat
.
g
+
(
1
-
c1
.
s
);
ctmp
.
g
=
2
*
c1
.
s
*
sat
.
g
+
(
1
-
c1
.
s
);
...
...
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