From 88cd7da01957d3c3e17cf01a313aa37e356a2e66 Mon Sep 17 00:00:00 2001 From: Joel Holdsworth Date: Thu, 14 Nov 2013 18:10:05 +0000 Subject: [PATCH] Ported Annotation to new srd_proto_data_annotation structure --- pv/view/decode/annotation.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pv/view/decode/annotation.cpp b/pv/view/decode/annotation.cpp index 339b46af..797b428a 100644 --- a/pv/view/decode/annotation.cpp +++ b/pv/view/decode/annotation.cpp @@ -53,10 +53,14 @@ const QColor Annotation::Colours[7] = { Annotation::Annotation(const srd_proto_data *const pdata) : _start_sample(pdata->start_sample), - _end_sample(pdata->end_sample), - _format(pdata->ann_format) + _end_sample(pdata->end_sample) { - const char *const *annotations = (char**)pdata->data; + assert(pdata); + const srd_proto_data_annotation *const pda = + (const srd_proto_data_annotation*)pdata->data; + assert(pda); + + const char *const *annotations = (char**)pda->ann_text; while(*annotations) { _annotations.push_back(QString(*annotations)); annotations++; -- 2.30.2