Tag version 0.5.1-alpha

main.cpp

@@ -30,7 +30,7 @@ int main(int argc, char *argv[])
 	QApplication::setApplicationDisplayName(QApplication::applicationName());
 	QApplication::setOrganizationName("gkmac.co.uk");
 	QApplication::setOrganizationDomain("gkmac.co.uk");
-	QApplication::setApplicationVersion("0.5-alpha");
+	QApplication::setApplicationVersion("0.5.1-alpha");
 	QCommandLineParser parser;
 	parser.setApplicationDescription(QApplication::applicationName());
 	parser.addHelpOption();

render.cpp

@@ -251,7 +251,6 @@ void TeletextPageRender::buildEnhanceMap(TextLayer *enhanceLayer, int tripletNum
 
 void TeletextPageRender::decodePage()
 {
-	QPainter pixmapPainter;
 	int currentFullRowColour, downwardsFullRowColour;
 	int renderedFullScreenColour;
 

x26model.h

@@ -114,7 +114,7 @@ private:
 
 		"Display attributes",
 		"DRCS character",
-		"Font style",
+		"Font style, level 3.5",
 		"G2 supplementary character",
 
 		"G0 character no diacritical",

x26triplets.cpp

@@ -53,7 +53,7 @@ void X26Triplet::setAddressColumn(int addressColumn)
 
 void X26Triplet::setObjectLocalDesignationCode(int i)
 {
-	m_address = 0x28 | (i >> 3);
+	m_address = (m_address & 0x38) | (i >> 3);
 	m_data = (m_data & 0x0f) | ((i & 0x07) << 4);
 }
 
@@ -64,7 +64,7 @@ void X26Triplet::setObjectLocalTripletNumber(int i)
 
 void X26Triplet::setObjectLocalIndex(int i)
 {
-	m_address = 0x28 + (i >= 104); // Set bit 0 of address if triplet >= 8
+	m_address = (m_address & 0x38) + (i >= 104); // Set bit 0 of address if triplet >= 8
 	m_data = (((i / 13) & 0x07) << 4) | (i % 13);
 }