Download-Tools/mkvtoolnix
1
0
Fork 0
mirror of https://gitlab.com/mbunkus/mkvtoolnix.git synced 2025-01-12 21:21:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

mmg: fix format string/data type differences with wxWidgets 3.0.0

Browse Source
This commit is contained in:
Moritz Bunkus 2013-11-24 21:58:04 +01:00
parent f66292abfc
commit 705419ed8c
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,5 +1,9 @@
2013-11-24 Moritz Bunkus <moritz@bunkus.org>
* mmg: bug fix: fixed an assertion in wxLogMessage() due to wrong
format string/argument data types caused by changes in wxWidgets
3.0.0. See Debian bug #730273.
* mkvmerge: bug fix: improved resilience against MP4 files with
obviously wrong entries in the 'sample size table' (STSZ) atom.

8
src/mmg/tabs/input.cpp
View File

@ -458,7 +458,7 @@ tab_input::parse_attachment_line(mmg_file_cptr file,
file->attached_files.push_back(a);
wxLogMessage(wxT("Attached file ID %ld MIME type '%s' size %ld description '%s' name '%s'"),
a->id, a->mime_type.c_str(), a->size, a->description.c_str(), a->name.c_str());
static_cast<long>(a->id), a->mime_type.c_str(), static_cast<long>(a->size), a->description.c_str(), a->name.c_str());
}
void
@ -526,11 +526,11 @@ tab_input::run_mkvmerge_identification(wxString const &file_name,
wxArrayString errors;
auto result = wxExecute(command, output, errors);
wxLogMessage(wxT("identify 1: result: %d"), result);
wxLogMessage(wxT("identify 1: result: %d"), static_cast<int>(result));
for (size_t i = 0; i < output.Count(); i++)
wxLogMessage(wxT("identify 1: output[%d]: ``%s''"), i, output[i].c_str());
wxLogMessage(wxT("identify 1: output[%d]: ``%s''"), static_cast<int>(i), output[i].c_str());
for (size_t i = 0; i < errors.Count(); i++)
wxLogMessage(wxT("identify 1: errors[%d]: ``%s''"), i, errors[i].c_str());
wxLogMessage(wxT("identify 1: errors[%d]: ``%s''"), static_cast<int>(i), errors[i].c_str());
wxRemoveFile(opt_file_name);