From c8f61d4d2c5028423a4917fcf64ecec31a372608 Mon Sep 17 00:00:00 2001
From: "G.K.MacGregor" <gkthemac@gmail.com>
Date: Tue, 20 Jun 2023 18:42:01 +0100
Subject: [PATCH] Fix default palette detection of CLUTs 1:7 and 3:7

---
 levelonepage.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/levelonepage.cpp b/levelonepage.cpp
index 1e160cc..97172bf 100644
--- a/levelonepage.cpp
+++ b/levelonepage.cpp
@@ -297,7 +297,7 @@ bool LevelOnePage::packetExists(int packetNumber, int designationCode) const
 			return !isPaletteDefault(16, 31);
 		}
 		if (designationCode == 4)
-			return !isPaletteDefault(0,15);
+			return !isPaletteDefault(0, 15);
 	}
 
 	return PageBase::packetExists(packetNumber, designationCode);
@@ -396,7 +396,7 @@ bool LevelOnePage::isPaletteDefault(int colour) const
 
 bool LevelOnePage::isPaletteDefault(int fromColour, int toColour) const
 {
-	for (int i=fromColour; i<toColour; i++)
+	for (int i=fromColour; i<=toColour; i++)
 		if (m_CLUT[i] != m_defaultCLUT[i])
 			return false;
 
@@ -412,7 +412,7 @@ int LevelOnePage::levelRequired() const
 	// TODO Check for X/28/1 for DCLUT for mode 1-3 DRCS characters - return 3
 
 	// Assume Level 2.5 if any X/28 page enhancements are present, otherwise assume Level 1
-	int levelSeen = (!isPaletteDefault(16,31) || m_leftSidePanelDisplayed || m_rightSidePanelDisplayed || m_defaultScreenColour !=0 || m_defaultRowColour !=0 || m_blackBackgroundSubst || m_colourTableRemap !=0 || m_defaultCharSet != 0 || m_secondCharSet != 0xf) ? 2 : 0;
+	int levelSeen = (!isPaletteDefault(16, 31) || m_leftSidePanelDisplayed || m_rightSidePanelDisplayed || m_defaultScreenColour !=0 || m_defaultRowColour !=0 || m_blackBackgroundSubst || m_colourTableRemap !=0 || m_defaultCharSet != 0 || m_secondCharSet != 0xf) ? 2 : 0;
 
 	// If there's no X/26 triplets, exit here as Level 1 or 2.5
 	if (m_enhancements.isEmpty())