From c515439594bf939e3f712856257a5a086b57616a Mon Sep 17 00:00:00 2001
From: "Matthias P. Braendli" <matthias.braendli@mpb.li>
Date: Wed, 30 Jan 2019 08:45:44 +0100
Subject: Fix FIG 2 data service labels

---
 src/fig0_2.cpp | 3 ++-
 src/figs.hpp   | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/fig0_2.cpp b/src/fig0_2.cpp
index a60601d..102b74f 100644
--- a/src/fig0_2.cpp
+++ b/src/fig0_2.cpp
@@ -50,7 +50,8 @@ bool fig0_2_is_complete(int services_id)
 // ETSI EN 300 401 6.3.1
 fig_result_t fig0_2(fig0_common_t& fig0, const display_settings_t &disp)
 {
-    uint16_t sref, sid;
+    uint16_t sref;
+    uint32_t sid;
     uint8_t cid, ecc, local, caid, ncomp, timd, ps, ca, subchid, scty;
     int k = 1;
     uint8_t* f = fig0.f;
diff --git a/src/figs.hpp b/src/figs.hpp
index 7169fc7..72d5f35 100644
--- a/src/figs.hpp
+++ b/src/figs.hpp
@@ -135,7 +135,7 @@ struct fig2_common_t {
                     return (pd == 0) ? 3 : 5;
                 }
             case 5: // Data service label
-                return 5;
+                return 4;
             case 6: // X-PAD user application label
                 {
                     uint8_t pd = (f[1] & 0x80) >> 7;
-- 
cgit v1.2.3