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
c78ad877
Commit
c78ad877
authored
Aug 01, 2014
by
Lorenz Meier
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #785 from Susurrus/valgrind_fixes
Valgrind fixes
parents
a88e7546
c51815fa
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
18 additions
and
8 deletions
+18
-8
core.cpp
libs/opmapcontrol/src/internals/core.cpp
+5
-0
core.h
libs/opmapcontrol/src/internals/core.h
+3
-0
pureprojection.h
libs/opmapcontrol/src/internals/pureprojection.h
+2
-1
GAudioOutput.cc
src/GAudioOutput.cc
+7
-7
MAVLinkProtocol.cc
src/comm/MAVLinkProtocol.cc
+1
-0
No files found.
libs/opmapcontrol/src/internals/core.cpp
View file @
c78ad877
...
...
@@ -42,8 +42,10 @@ namespace internals {
minOfTiles
(
0
,
0
),
maxOfTiles
(
0
,
0
),
zoom
(
0
),
projection
(
NULL
),
isDragging
(
false
),
TooltipTextPadding
(
10
,
10
),
mapType
(
MapType
::
GoogleMap
),
loaderLimit
(
5
),
maxzoom
(
21
),
runningThreads
(
0
),
...
...
@@ -61,6 +63,9 @@ namespace internals {
}
Core
::~
Core
()
{
if
(
projection
)
{
delete
projection
;
}
ProcessLoadTaskCallback
.
waitForDone
();
}
...
...
libs/opmapcontrol/src/internals/core.h
View file @
c78ad877
...
...
@@ -135,6 +135,9 @@ namespace internals {
}
void
SetProjection
(
PureProjection
*
value
)
{
if
(
projection
)
{
delete
projection
;
}
projection
=
value
;
tileRect
=
Rectangle
(
core
::
Point
(
0
,
0
),
value
->
TileSize
());
}
...
...
libs/opmapcontrol/src/internals/pureprojection.h
View file @
c78ad877
...
...
@@ -42,8 +42,9 @@ namespace internals
class
PureProjection
{
public:
virtual
~
PureProjection
()
{}
virtual
Size
TileSize
()
const
=
0
;
virtual
double
Axis
()
const
=
0
;
...
...
src/GAudioOutput.cc
View file @
c78ad877
...
...
@@ -94,13 +94,13 @@ GAudioOutput::GAudioOutput(QObject *parent) : QObject(parent),
#if defined Q_OS_LINUX && defined QGC_SPEECH_ENABLED
espeak_Initialize
(
AUDIO_OUTPUT_PLAYBACK
,
500
,
NULL
,
0
);
// initialize for playback with 500ms buffer and no options (see speak_lib.h)
espeak_VOICE
espeak_voice
;
espeak_voice
.
languages
=
"en-uk"
;
// Default to British English
espeak_voice
.
identifier
=
NULL
;
// no specific voice file specified
espeak_voice
.
name
=
"klatt"
;
// espeak voice name
espeak_voice
.
gender
=
2
;
// Female
espeak_voice
.
age
=
0
;
// age not specified
espeak_SetVoiceByProperties
(
&
espeak_voice
);
espeak_VOICE
*
espeak_voice
=
espeak_GetCurrentVoice
()
;
espeak_voice
->
languages
=
"en-uk"
;
// Default to British English
espeak_voice
->
identifier
=
NULL
;
// no specific voice file specified
espeak_voice
->
name
=
"klatt"
;
// espeak voice name
espeak_voice
->
gender
=
2
;
// Female
espeak_voice
->
age
=
0
;
// age not specified
espeak_SetVoiceByProperties
(
espeak_voice
);
#endif
#if defined _MSC_VER && defined QGC_SPEECH_ENABLED
...
...
src/comm/MAVLinkProtocol.cc
View file @
c78ad877
...
...
@@ -183,6 +183,7 @@ void MAVLinkProtocol::run()
while
(
!
_should_exit
)
{
if
(
isFinished
())
{
delete
heartbeatTimer
;
qDebug
()
<<
"MAVLINK WORKER DONE!"
;
return
;
}
...
...
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