projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
69861be
)
Fix crash in verification due to mismatched wxString::Format placeholder.
v2.15.47
author
Carl Hetherington
<cth@carlh.net>
Tue, 3 Mar 2020 09:26:02 +0000
(10:26 +0100)
committer
Carl Hetherington
<cth@carlh.net>
Tue, 3 Mar 2020 09:26:23 +0000
(10:26 +0100)
src/wx/verify_dcp_dialog.cc
patch
|
blob
|
history
diff --git
a/src/wx/verify_dcp_dialog.cc
b/src/wx/verify_dcp_dialog.cc
index a61d9bf11a959f19eb37e6ee1520c8d5e3347271..c3cf5cc2250bf7db52698fddf6d13a83f64d4413 100644
(file)
--- 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."),
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:
);
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."),
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:
);
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(
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."),
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;
);
}
break;