subtitle.cpp: return correct size of consumed bytes

[vuplus_dvbapp] / lib / dvb / subtitle.cpp

diff --git a/lib/dvb/subtitle.cpp b/lib/dvb/subtitle.cpp
index 642327b..3787ab1 100644 (file)
--- a/lib/dvb/subtitle.cpp
+++ b/lib/dvb/subtitle.cpp
@@ -81,7 +81,7 @@ void eDVBSubtitleParser::subtitle_process_line(subtitle_page *page, int object_i
                                }
 //                             //eDebug("inserting %d bytes (into region %d)", len, region->region_id);
 //                             eDebug("put data to region_buffer %p", &(*region->region_buffer));
-                               memcpy((__u8*)region->region_buffer->surface->data + region->region_width * y + x, data, len);
+                               memcpy((__u8*)region->region_buffer->surface->data + region->region_buffer->surface->stride * y + x, data, len);
                        }
                        object = object->next;
                }
@@ -243,17 +243,17 @@ int eDVBSubtitleParser::subtitle_process_pixel_data(subtitle_page *page, int obj
                bitstream_init(&bit, data, 4);
                for ( int i=0; i < 4; ++i )
                        bitstream_get(&bit);
-               break;
+               return 2 + 1;
        case 0x21:  // ignore 2 -> 8bit map table
                bitstream_init(&bit, data, 8);
                for ( int i=0; i < 4; ++i )
                        bitstream_get(&bit);
-               break;
+               return 4 + 1;
        case 0x22:  // ignore 4 -> 8bit map table
                bitstream_init(&bit, data, 8);
                for ( int i=0; i < 16; ++i )
                        bitstream_get(&bit);
-               break;
+               return 16 + 1;
        case 0xF0:
                subtitle_process_line(page, object_id, *linenr, line, *linep);
 /*             {
@@ -490,7 +490,8 @@ int eDVBSubtitleParser::subtitle_process_segment(__u8 *segment)
                region->region_height |= *segment++;
                processed_length += 2;
 
-               region->region_buffer = new gPixmap(eSize(region->region_width, region->region_height), 8);
+               region->region_buffer = new gPixmap(eSize(region->region_width, region->region_height), 8, 1);
+               memset(region->region_buffer->surface->data, 0, region->region_height * region->region_buffer->surface->stride);
                //eDebug("new region_buffer %p", &(*region->region_buffer));
 
                int region_level_of_compatibility, region_depth;