daniel/QTeletextMaker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Enforce subobject types invoked within objects

Browse Source
This commit is contained in:
G.K.MacGregor
2021-04-18 21:41:44 +01:00
parent 2ad5d45153
commit d3607f5b00
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
render.cpp
View File

@@ -163,7 +163,7 @@ void TeletextPageRender::buildEnhanceMap(TextLayer *enhanceLayer, int tripletNum
if ((x26Triplet->address() & 0x18) == 0x08) { if ((x26Triplet->address() & 0x18) == 0x08) {
// Local Object // Local Object
// Check if the pointer in the Invocation triplet is valid // Check if the pointer in the Invocation triplet is valid
// Can't point to triplets 13-15; only 12 triplets per packet // Can't point to triplets 13-15; only triplets 0-12 per packet
if ((x26Triplet->data() & 0x0f) > 12) if ((x26Triplet->data() & 0x0f) > 12)
break; break;
int tripletPointer = ((x26Triplet->data() >> 4) | ((x26Triplet->address() & 1) << 3)) * 13 + (x26Triplet->data() & 0x0f); int tripletPointer = ((x26Triplet->data() >> 4) | ((x26Triplet->address() & 1) << 3)) * 13 + (x26Triplet->data() & 0x0f);
@@ -173,12 +173,15 @@ void TeletextPageRender::buildEnhanceMap(TextLayer *enhanceLayer, int tripletNum
// Check if we're pointing to an actual Object Definition of the same type // Check if we're pointing to an actual Object Definition of the same type
if ((x26Triplet->mode() | 0x04) != m_levelOnePage->enhancements()->at(tripletPointer).mode()) if ((x26Triplet->mode() | 0x04) != m_levelOnePage->enhancements()->at(tripletPointer).mode())
break; break;
// The Object Definition can't declare it's at triplet 13-15; only 12 triplets per packet // The Object Definition can't declare it's at triplet 13-15; only triplets 0-12 per packet
if ((m_levelOnePage->enhancements()->at(tripletPointer).data() & 0x0f) > 12) if ((m_levelOnePage->enhancements()->at(tripletPointer).data() & 0x0f) > 12)
break; break;
// Check if the Object Definition triplet is where it declares it is // Check if the Object Definition triplet is where it declares it is
if ((((m_levelOnePage->enhancements()->at(tripletPointer).data() >> 4) | ((m_levelOnePage->enhancements()->at(tripletPointer).address() & 1) << 3)) * 13 + (m_levelOnePage->enhancements()->at(tripletPointer).data() & 0x0f)) != tripletPointer) if ((((m_levelOnePage->enhancements()->at(tripletPointer).data() >> 4) | ((m_levelOnePage->enhancements()->at(tripletPointer).address() & 1) << 3)) * 13 + (m_levelOnePage->enhancements()->at(tripletPointer).data() & 0x0f)) != tripletPointer)
break; break;
// Check if (sub)Object type can be invoked by Object type we're within
if (enhanceLayer->objectType() >= (x26Triplet->mode() & 0x03))
break;
// Is the object required at the current presentation Level? // Is the object required at the current presentation Level?
if (m_renderLevel == 2 && (m_levelOnePage->enhancements()->at(tripletPointer).address() & 0x08) == 0x00) if (m_renderLevel == 2 && (m_levelOnePage->enhancements()->at(tripletPointer).address() & 0x08) == 0x00)
break; break;