From 705419ed8c5e1f568cd84ece16b1b0853dc11a88 Mon Sep 17 00:00:00 2001 From: Moritz Bunkus Date: Sun, 24 Nov 2013 21:58:04 +0100 Subject: [PATCH] mmg: fix format string/data type differences with wxWidgets 3.0.0 --- ChangeLog | 4 ++++ src/mmg/tabs/input.cpp | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index ed7db3807..d64aa7875 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2013-11-24 Moritz Bunkus + * 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. diff --git a/src/mmg/tabs/input.cpp b/src/mmg/tabs/input.cpp index 83694eb29..bddc10851 100644 --- a/src/mmg/tabs/input.cpp +++ b/src/mmg/tabs/input.cpp @@ -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(a->id), a->mime_type.c_str(), static_cast(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(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(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(i), errors[i].c_str()); wxRemoveFile(opt_file_name);