projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Automatically save/restore main window state
[pulseview.git]
/
pv
/
data
/
decode
/
annotation.cpp
diff --git
a/pv/data/decode/annotation.cpp
b/pv/data/decode/annotation.cpp
index e17dcb5177cd73ab818d31e08a8c84d60133df15..16895851a2c4401432a3e028ef658f94118b363e 100644
(file)
--- a/
pv/data/decode/annotation.cpp
+++ b/
pv/data/decode/annotation.cpp
@@
-22,9
+22,10
@@
extern "C" {
#include <libsigrokdecode/libsigrokdecode.h>
}
#include <libsigrokdecode/libsigrokdecode.h>
}
-#include "annotation.h"
+#include <cassert>
+#include <vector>
-using namespace std;
+#include "annotation.h"
namespace pv {
namespace data {
namespace pv {
namespace data {
@@
-39,7
+40,7
@@
Annotation::Annotation(const srd_proto_data *const pdata) :
(const srd_proto_data_annotation*)pdata->data;
assert(pda);
(const srd_proto_data_annotation*)pdata->data;
assert(pda);
- _format = pda->ann_
format
;
+ _format = pda->ann_
class
;
const char *const *annotations = (char**)pda->ann_text;
while(*annotations) {
const char *const *annotations = (char**)pda->ann_text;
while(*annotations) {