X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdata%2Fdecode%2Frowdata.cpp;h=3d250f49472eb03194d1001c6dd693c2ef644ae2;hp=0434e1c0d8aad7a2d93e2ecf26555377ff6fb62f;hb=1e948182f3f9353bd74875a37cacc833312a8c8e;hpb=88a2597864920ecdbe66cf0cd4b8172bdabb2263 diff --git a/pv/data/decode/rowdata.cpp b/pv/data/decode/rowdata.cpp index 0434e1c0..3d250f49 100644 --- a/pv/data/decode/rowdata.cpp +++ b/pv/data/decode/rowdata.cpp @@ -63,7 +63,7 @@ void RowData::get_annotation_subset( uint32_t max_ann_class_id = 0; for (AnnotationClass* c : row_->ann_classes()) { - if (!c->visible) + if (!c->visible()) all_ann_classes_enabled = false; else all_ann_classes_disabled = false; @@ -83,7 +83,7 @@ void RowData::get_annotation_subset( vector class_visible; class_visible.resize(max_ann_class_id + 1, 0); for (AnnotationClass* c : row_->ann_classes()) - if (c->visible) + if (c->visible()) class_visible[c->id] = 1; for (const auto& annotation : annotations_) @@ -104,7 +104,7 @@ const Annotation* RowData::emplace_annotation(srd_proto_data *pdata) { const srd_proto_data_annotation *const pda = (const srd_proto_data_annotation*)pdata->data; - Annotation::Class ann_class_id = (Annotation::Class)(pda->ann_class); + uint32_t ann_class_id = pda->ann_class; // Look up the longest annotation text to see if we have it in storage. // This implies that if the longest text is the same, the shorter texts