git.cweiske.de
/
enigma2.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
57fadd1
)
subtitle.cpp: dont use hardcoded line size of 720
author
ghost
<andreas.monzner@multimedia-labs.de>
Wed, 12 Aug 2009 13:55:17 +0000
(15:55 +0200)
committer
ghost
<andreas.monzner@multimedia-labs.de>
Wed, 12 Aug 2009 13:55:17 +0000
(15:55 +0200)
lib/dvb/subtitle.cpp
patch
|
blob
|
history
diff --git
a/lib/dvb/subtitle.cpp
b/lib/dvb/subtitle.cpp
index 82cf002361dfca6c85701d7aa96779cd78cf11af..06bb266eb596b7c2a6ccaab4ac25cc7062956e9b 100644
(file)
--- a/
lib/dvb/subtitle.cpp
+++ b/
lib/dvb/subtitle.cpp
@@
-82,7
+82,7
@@
static int map_4_to_8_bit_table[16];
int eDVBSubtitleParser::subtitle_process_pixel_data(subtitle_region *region, subtitle_region_object *object, int *linenr, int *linep, __u8 *data)
{
int data_type = *data++;
int eDVBSubtitleParser::subtitle_process_pixel_data(subtitle_region *region, subtitle_region_object *object, int *linenr, int *linep, __u8 *data)
{
int data_type = *data++;
- static __u8 line[
7
20];
+ static __u8 line[
19
20];
bitstream bit;
bit.size=0;
bitstream bit;
bit.size=0;
@@
-142,7
+142,7
@@
int eDVBSubtitleParser::subtitle_process_pixel_data(subtitle_region *region, sub
map_2_to_4_bit_table[col] :
region->depth == subtitle_region::bpp8 ?
map_2_to_8_bit_table[col] : col;
map_2_to_4_bit_table[col] :
region->depth == subtitle_region::bpp8 ?
map_2_to_8_bit_table[col] : col;
- while (len && ((*linep) <
720
))
+ while (len && ((*linep) <
m_display_size.width()
))
{
line[(*linep)++] = c;
len--;
{
line[(*linep)++] = c;
len--;
@@
-197,7
+197,7
@@
int eDVBSubtitleParser::subtitle_process_pixel_data(subtitle_region *region, sub
}
uint8_t c = region->depth == subtitle_region::bpp8 ?
map_4_to_8_bit_table[col] : col;
}
uint8_t c = region->depth == subtitle_region::bpp8 ?
map_4_to_8_bit_table[col] : col;
- while (len && ((*linep) <
720
))
+ while (len && ((*linep) <
m_display_size.width()
))
{
line[(*linep)++] = c;
len--;
{
line[(*linep)++] = c;
len--;
@@
-231,7
+231,7
@@
int eDVBSubtitleParser::subtitle_process_pixel_data(subtitle_region *region, sub
} else
break;
}
} else
break;
}
- while (len && ((*linep) <
720
))
+ while (len && ((*linep) <
m_display_size.width()
))
{
line[(*linep)++] = col;
len--;
{
line[(*linep)++] = col;
len--;
@@
-270,7
+270,7
@@
int eDVBSubtitleParser::subtitle_process_pixel_data(subtitle_region *region, sub
subtitle_process_line(region, object, *linenr, line, *linep);
/* {
int i;
subtitle_process_line(region, object, *linenr, line, *linep);
/* {
int i;
- for (i=0; i<
720
; ++i)
+ for (i=0; i<
m_display_size.width()
; ++i)
eDebugNoNewLine("%d ", line[i]);
eDebug("");
} */
eDebugNoNewLine("%d ", line[i]);
eDebug("");
} */