Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
D
dsview
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Raptor Engineering Public Development
dsview
Commits
f0aff5e7
Commit
f0aff5e7
authored
Mar 25, 2016
by
DreamSourceLab
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix memory release issue when added protocol decoder
parent
0a6f675f
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
11 deletions
+14
-11
DSView/pv/data/decoderstack.cpp
DSView/pv/data/decoderstack.cpp
+2
-0
DSView/pv/dock/protocoldock.cpp
DSView/pv/dock/protocoldock.cpp
+4
-4
DSView/pv/sigsession.cpp
DSView/pv/sigsession.cpp
+8
-7
No files found.
DSView/pv/data/decoderstack.cpp
View file @
f0aff5e7
...
...
@@ -213,6 +213,8 @@ void DecoderStack::clear()
void
DecoderStack
::
stop_decode
()
{
_snapshot
.
reset
();
if
(
_decode_state
==
Stopped
)
return
;
...
...
DSView/pv/dock/protocoldock.cpp
View file @
f0aff5e7
...
...
@@ -103,10 +103,10 @@ int ProtocolDock::decoder_name_cmp(const void *a, const void *b)
void
ProtocolDock
::
paintEvent
(
QPaintEvent
*
)
{
QStyleOption
opt
;
opt
.
init
(
this
);
QPainter
p
(
this
);
style
()
->
drawPrimitive
(
QStyle
::
PE_Widget
,
&
opt
,
&
p
,
this
);
//
QStyleOption opt;
//
opt.init(this);
//
QPainter p(this);
//
style()->drawPrimitive(QStyle::PE_Widget, &opt, &p, this);
}
void
ProtocolDock
::
add_protocol
()
...
...
DSView/pv/sigsession.cpp
View file @
f0aff5e7
...
...
@@ -608,6 +608,13 @@ void SigSession::read_sample_rate(const sr_dev_inst *const sdi)
void
SigSession
::
feed_in_header
(
const
sr_dev_inst
*
sdi
)
{
#ifdef ENABLE_DECODE
for
(
vector
<
boost
::
shared_ptr
<
view
::
DecodeTrace
>
>::
iterator
i
=
_decode_traces
.
begin
();
i
!=
_decode_traces
.
end
();
i
++
)
(
*
i
)
->
decoder
()
->
stop_decode
();
#endif
read_sample_rate
(
sdi
);
//receive_data(0);
}
...
...
@@ -1098,13 +1105,7 @@ void SigSession::data_feed_in(const struct sr_dev_inst *sdi,
_cur_dso_snapshot
.
reset
();
_cur_analog_snapshot
.
reset
();
}
#ifdef ENABLE_DECODE
for
(
vector
<
boost
::
shared_ptr
<
view
::
DecodeTrace
>
>::
iterator
i
=
_decode_traces
.
begin
();
i
!=
_decode_traces
.
end
();
i
++
)
(
*
i
)
->
decoder
()
->
stop_decode
();
#endif
frame_ended
();
break
;
}
...
...
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