From: ghost <andreas.monzner@multimedia-labs.de>
Date: Mon, 27 Jul 2009 17:55:11 +0000 (+0200)
Subject: lib/dvb/subtitle.cpp: change assertions to warnings
X-Git-Tag: 2.6.0~176
X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/e448808c8c2faf89397318e61fd83259835d1977?hp=23de7615ef81a628d5a405e7a6dd0850cbb81d26

lib/dvb/subtitle.cpp: change assertions to warnings
---

diff --git a/lib/dvb/subtitle.cpp b/lib/dvb/subtitle.cpp
index 047e76d4..82cf0023 100644
--- a/lib/dvb/subtitle.cpp
+++ b/lib/dvb/subtitle.cpp
@@ -658,7 +658,6 @@ int eDVBSubtitleParser::subtitle_process_segment(__u8 *segment)
 			if (entry_CLUT_flag & 1) // 8bit
 			{
 //				eDebugNoNewLine("8b");
-				ASSERT(CLUT_entry_id < 256);
 				clut->entries_8bit[CLUT_entry_id].Y = v_Y;
 				clut->entries_8bit[CLUT_entry_id].Cr = v_Cr;
 				clut->entries_8bit[CLUT_entry_id].Cb = v_Cb;
@@ -668,22 +667,30 @@ int eDVBSubtitleParser::subtitle_process_segment(__u8 *segment)
 			if (entry_CLUT_flag & 2) // 4bit
 			{
 //				eDebugNoNewLine("4b");
-				ASSERT(CLUT_entry_id < 16);
-				clut->entries_4bit[CLUT_entry_id].Y = v_Y;
-				clut->entries_4bit[CLUT_entry_id].Cr = v_Cr;
-				clut->entries_4bit[CLUT_entry_id].Cb = v_Cb;
-				clut->entries_4bit[CLUT_entry_id].T = v_T;
-				clut->entries_4bit[CLUT_entry_id].valid = 1;
+				if (CLUT_entry_id < 16)
+				{
+					clut->entries_4bit[CLUT_entry_id].Y = v_Y;
+					clut->entries_4bit[CLUT_entry_id].Cr = v_Cr;
+					clut->entries_4bit[CLUT_entry_id].Cb = v_Cb;
+					clut->entries_4bit[CLUT_entry_id].T = v_T;
+					clut->entries_4bit[CLUT_entry_id].valid = 1;
+				}
+				else
+					eDebug("CLUT entry marked as 4 bit with id %d (>15)", CLUT_entry_id);
 			}
 			if (entry_CLUT_flag & 4) // 2bit
 			{
 //				eDebugNoNewLine("2b");
-				ASSERT(CLUT_entry_id < 4);
-				clut->entries_2bit[CLUT_entry_id].Y = v_Y;
-				clut->entries_2bit[CLUT_entry_id].Cr = v_Cr;
-				clut->entries_2bit[CLUT_entry_id].Cb = v_Cb;
-				clut->entries_2bit[CLUT_entry_id].T = v_T;
-				clut->entries_2bit[CLUT_entry_id].valid = 1;
+				if (CLUT_entry_id < 4)
+				{
+					clut->entries_2bit[CLUT_entry_id].Y = v_Y;
+					clut->entries_2bit[CLUT_entry_id].Cr = v_Cr;
+					clut->entries_2bit[CLUT_entry_id].Cb = v_Cb;
+					clut->entries_2bit[CLUT_entry_id].T = v_T;
+					clut->entries_2bit[CLUT_entry_id].valid = 1;
+				}
+				else
+					eDebug("CLUT entry marked as 2 bit with id %d (>3)", CLUT_entry_id);
 			}
 //			eDebug(" %04x %02x %02x %02x %02x", CLUT_entry_id, v_Y, v_Cb, v_Cr, v_T);
 		}