Backport fixes from master
- Ogg: Properly ininitialize data_count on read ogg pages - Movie editor: Fix displaying unicode characters
This commit is contained in:
parent
3ded324737
commit
8c4b8e1605
2 changed files with 5 additions and 2 deletions
|
@ -113,8 +113,11 @@ ogg_page::ogg_page(const char* buffer, size_t& advance) throw(std::runtime_error
|
|||
throw std::runtime_error("Bad Ogg page flags");
|
||||
//Compute length.
|
||||
size_t b = 27 + (unsigned char)buffer[26];
|
||||
for(unsigned i = 0; i < (unsigned char)buffer[26]; i++)
|
||||
data_count = 0;
|
||||
for(unsigned i = 0; i < (unsigned char)buffer[26]; i++) {
|
||||
b += (unsigned char)buffer[27 + i];
|
||||
data_count += (unsigned char)buffer[27 + i];
|
||||
}
|
||||
//Check the CRC.
|
||||
uint32_t claimed = read32ule(buffer + 22);
|
||||
uint32_t x = 0;
|
||||
|
|
|
@ -558,7 +558,7 @@ void wxeditor_movie::_moviepanel::render_linen(text_framebuffer& fb, controller_
|
|||
fb.write(i.title, 0, divcnt + 1 + i.position_left, y, 0x000000, 0xFFFFFF);
|
||||
} else if(i.type == 0) {
|
||||
//Button.
|
||||
char c[2];
|
||||
char32_t c[2];
|
||||
bool v = (fcontrols.read_index(f, i.index) != 0);
|
||||
c[0] = i.ch;
|
||||
c[1] = 0;
|
||||
|
|
Loading…
Add table
Reference in a new issue