diff options
| author | Carl Hetherington <cth@carlh.net> | 2020-03-03 10:26:02 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2020-03-03 10:26:23 +0100 |
| commit | f6557e4bedd788a026d48fe883cb48a1070dc886 (patch) | |
| tree | 71e7b56a18f98751e9c15c347ff8a996a2c42b22 | |
| parent | 69861be7113fef28bf1cbd9aa6371e5c9b033dd9 (diff) | |
Fix crash in verification due to mismatched wxString::Format placeholder.v2.15.47
| -rw-r--r-- | src/wx/verify_dcp_dialog.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/wx/verify_dcp_dialog.cc b/src/wx/verify_dcp_dialog.cc index a61d9bf11..c3cf5cc22 100644 --- a/src/wx/verify_dcp_dialog.cc +++ b/src/wx/verify_dcp_dialog.cc @@ -84,7 +84,7 @@ VerifyDCPDialog::VerifyDCPDialog (wxWindow* parent, shared_ptr<VerifyDCPJob> job case dcp::VerificationNote::PICTURE_HASH_INCORRECT: text = wxString::Format( _("The hash of the picture asset %s does not agree with the PKL file. This probably means that the asset file is corrupt."), - std_to_wx(i.file()->filename().string()).data() + std_to_wx(i.file()->filename().string()) ); break; case dcp::VerificationNote::PKL_CPL_PICTURE_HASHES_DISAGREE: @@ -93,7 +93,7 @@ VerifyDCPDialog::VerifyDCPDialog (wxWindow* parent, shared_ptr<VerifyDCPJob> job case dcp::VerificationNote::SOUND_HASH_INCORRECT: text = wxString::Format( _("The hash of the sound asset %s does not agree with the PKL file. This probably means that the asset file is corrupt."), - std_to_wx(i.file()->filename().string()).data() + std_to_wx(i.file()->filename().string()) ); break; case dcp::VerificationNote::PKL_CPL_SOUND_HASHES_DISAGREE: @@ -111,14 +111,14 @@ VerifyDCPDialog::VerifyDCPDialog (wxWindow* parent, shared_ptr<VerifyDCPJob> job case dcp::VerificationNote::XML_VALIDATION_ERROR: if (i.line()) { text = wxString::Format( - _("The XML in %s is malformed on line %d."), - std_to_wx(i.file()->filename().string()).data(), + _("The XML in %s is malformed on line %" PRIu64 "."), + std_to_wx(i.file()->filename().string()), i.line().get() ); } else { text = wxString::Format( _("The XML in %s is malformed."), - std_to_wx(i.file()->filename().string()).data() + std_to_wx(i.file()->filename().string()) ); } break; |