Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
otb
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
David Youssefi
otb
Commits
0358c221
Commit
0358c221
authored
16 years ago
by
OTB Bot
Browse files
Options
Downloads
Patches
Plain Diff
correction conversion double vers float (warning VS7.1)
parent
eb98309d
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
Utilities/FLTK/src/Fl_Input_.cxx
+7
-7
7 additions, 7 deletions
Utilities/FLTK/src/Fl_Input_.cxx
with
7 additions
and
7 deletions
Utilities/FLTK/src/Fl_Input_.cxx
+
7
−
7
View file @
0358c221
...
@@ -226,7 +226,7 @@ void Fl_Input_::drawtext(int X, int Y, int W, int H) {
...
@@ -226,7 +226,7 @@ void Fl_Input_::drawtext(int X, int Y, int W, int H) {
p
=
value
();
p
=
value
();
// visit each line and draw it:
// visit each line and draw it:
int
desc
=
height
-
fl_descent
();
int
desc
=
height
-
fl_descent
();
float
xpos
=
X
-
xscroll_
+
1
;
float
xpos
=
(
float
)(
X
-
xscroll_
+
1
)
;
int
ypos
=
-
yscroll_
;
int
ypos
=
-
yscroll_
;
for
(;
ypos
<
H
;)
{
for
(;
ypos
<
H
;)
{
...
@@ -241,14 +241,14 @@ void Fl_Input_::drawtext(int X, int Y, int W, int H) {
...
@@ -241,14 +241,14 @@ void Fl_Input_::drawtext(int X, int Y, int W, int H) {
if
(
readonly
())
erase_cursor_only
=
0
;
// this isn't the most efficient way
if
(
readonly
())
erase_cursor_only
=
0
;
// this isn't the most efficient way
if
(
erase_cursor_only
&&
p
>
pp
)
goto
CONTINUE2
;
// this line is after
if
(
erase_cursor_only
&&
p
>
pp
)
goto
CONTINUE2
;
// this line is after
// calculate area to erase:
// calculate area to erase:
float
r
=
X
+
W
;
float
r
=
(
float
)(
X
+
W
)
;
float
xx
;
float
xx
;
if
(
p
>=
pp
)
{
if
(
p
>=
pp
)
{
xx
=
X
;
xx
=
(
float
)(
X
)
;
if
(
erase_cursor_only
)
r
=
xpos
+
2
;
if
(
erase_cursor_only
)
r
=
xpos
+
2
;
else
if
(
readonly
())
xx
-=
3
;
else
if
(
readonly
())
xx
-=
3
;
}
else
{
}
else
{
xx
=
xpos
+
expandpos
(
p
,
pp
,
buf
,
0
);
xx
=
(
float
)(
xpos
+
expandpos
(
p
,
pp
,
buf
,
0
)
)
;
if
(
erase_cursor_only
)
r
=
xx
+
2
;
if
(
erase_cursor_only
)
r
=
xx
+
2
;
else
if
(
readonly
())
xx
-=
3
;
else
if
(
readonly
())
xx
-=
3
;
}
}
...
@@ -268,13 +268,13 @@ void Fl_Input_::drawtext(int X, int Y, int W, int H) {
...
@@ -268,13 +268,13 @@ void Fl_Input_::drawtext(int X, int Y, int W, int H) {
int
offset1
=
0
;
int
offset1
=
0
;
if
(
pp
>
p
)
{
if
(
pp
>
p
)
{
fl_color
(
tc
);
fl_color
(
tc
);
x1
+=
expandpos
(
p
,
pp
,
buf
,
&
offset1
);
x1
+=
(
float
)(
expandpos
(
p
,
pp
,
buf
,
&
offset1
)
)
;
fl_draw
(
buf
,
offset1
,
xpos
,
(
float
)(
Y
+
ypos
+
desc
));
fl_draw
(
buf
,
offset1
,
xpos
,
(
float
)(
Y
+
ypos
+
desc
));
}
}
pp
=
value
()
+
selend
;
pp
=
value
()
+
selend
;
float
x2
=
X
+
W
;
float
x2
=
(
float
)(
X
+
W
)
;
int
offset2
;
int
offset2
;
if
(
pp
<=
e
)
x2
=
xpos
+
expandpos
(
p
,
pp
,
buf
,
&
offset2
);
if
(
pp
<=
e
)
x2
=
(
float
)(
xpos
+
expandpos
(
p
,
pp
,
buf
,
&
offset2
)
)
;
else
offset2
=
strlen
(
buf
);
else
offset2
=
strlen
(
buf
);
fl_color
(
selection_color
());
fl_color
(
selection_color
());
fl_rectf
((
int
)(
x1
+
0.5
),
Y
+
ypos
,
(
int
)(
x2
-
x1
+
0.5
),
height
);
fl_rectf
((
int
)(
x1
+
0.5
),
Y
+
ypos
,
(
int
)(
x2
-
x1
+
0.5
),
height
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment