Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Q
qgroundcontrol
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
5953275f
Commit
5953275f
authored
Sep 29, 2014
by
Don Gagne
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #867 from DonLakeFlyer/qwtWarnings
Hack fix for qwt 64 bit Windows compiler warnings
parents
61dd5731
10a35ec8
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
6 deletions
+6
-6
qwt_plot_curve.cpp
libs/qwt/qwt_plot_curve.cpp
+2
-2
qwt_point_data.cpp
libs/qwt/qwt_point_data.cpp
+3
-3
qwt_series_data.cpp
libs/qwt/qwt_series_data.cpp
+1
-1
No files found.
libs/qwt/qwt_plot_curve.cpp
View file @
5953275f
...
...
@@ -349,7 +349,7 @@ void QwtPlotCurve::drawSeries( QPainter *painter,
const
QwtScaleMap
&
xMap
,
const
QwtScaleMap
&
yMap
,
const
QRectF
&
canvasRect
,
int
from
,
int
to
)
const
{
const
size_t
numSamples
=
dataSize
(
);
const
int
numSamples
=
static_cast
<
int
>
(
dataSize
()
);
if
(
!
painter
||
numSamples
<=
0
)
return
;
...
...
@@ -405,7 +405,7 @@ void QwtPlotCurve::drawCurve( QPainter *painter, int style,
// we always need the complete
// curve for fitting
from
=
0
;
to
=
dataSize
(
)
-
1
;
to
=
static_cast
<
int
>
(
dataSize
()
)
-
1
;
}
drawLines
(
painter
,
xMap
,
yMap
,
canvasRect
,
from
,
to
);
break
;
...
...
libs/qwt/qwt_point_data.cpp
View file @
5953275f
...
...
@@ -37,10 +37,10 @@ QwtPointArrayData::QwtPointArrayData(
QwtPointArrayData
::
QwtPointArrayData
(
const
double
*
x
,
const
double
*
y
,
size_t
size
)
{
d_x
.
resize
(
s
ize
);
d_x
.
resize
(
s
tatic_cast
<
int
>
(
size
)
);
::
memcpy
(
d_x
.
data
(),
x
,
size
*
sizeof
(
double
)
);
d_y
.
resize
(
size
);
d_y
.
resize
(
static_cast
<
int
>
(
size
)
);
::
memcpy
(
d_y
.
data
(),
y
,
size
*
sizeof
(
double
)
);
}
...
...
@@ -273,7 +273,7 @@ QPointF QwtSyntheticPointData::sample( size_t index ) const
if
(
index
>=
d_size
)
return
QPointF
(
0
,
0
);
const
double
xValue
=
x
(
index
);
const
double
xValue
=
x
(
static_cast
<
uint
>
(
index
)
);
const
double
yValue
=
y
(
xValue
);
return
QPointF
(
xValue
,
yValue
);
...
...
libs/qwt/qwt_series_data.cpp
View file @
5953275f
...
...
@@ -78,7 +78,7 @@ QRectF qwtBoundingRectT(
from
=
0
;
if
(
to
<
0
)
to
=
s
eries
.
size
(
)
-
1
;
to
=
s
tatic_cast
<
int
>
(
series
.
size
()
)
-
1
;
if
(
to
<
from
)
return
boundingRect
;
...
...
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