projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix a couple more crashes with incorrect KDMs (#1000).
[dcpomatic.git]
/
src
/
wx
/
image_sequence_dialog.cc
diff --git
a/src/wx/image_sequence_dialog.cc
b/src/wx/image_sequence_dialog.cc
index 0cdf653a57a081c1e63fc250a884b3b56def665c..0484b900ea176e3fe55b8bf09aa9de9de409441b 100644
(file)
--- a/
src/wx/image_sequence_dialog.cc
+++ b/
src/wx/image_sequence_dialog.cc
@@
-1,25
+1,28
@@
/*
Copyright (C) 2014-2015 Carl Hetherington <cth@carlh.net>
/*
Copyright (C) 2014-2015 Carl Hetherington <cth@carlh.net>
- This program is free software; you can redistribute it and/or modify
+ This file is part of DCP-o-matic.
+
+ DCP-o-matic is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
-
This program
is distributed in the hope that it will be useful,
+
DCP-o-matic
is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ along with DCP-o-matic. If not, see <http://www.gnu.org/licenses/>.
*/
#include "wx_util.h"
#include "image_sequence_dialog.h"
*/
#include "wx_util.h"
#include "image_sequence_dialog.h"
-#include "lib/raw_convert.h"
+#include <dcp/locale_convert.h>
+
+using dcp::locale_convert;
ImageSequenceDialog::ImageSequenceDialog (wxWindow* parent)
: TableDialog (parent, _("Add image sequence"), 2, 1, true)
ImageSequenceDialog::ImageSequenceDialog (wxWindow* parent)
: TableDialog (parent, _("Add image sequence"), 2, 1, true)
@@
-33,7
+36,7
@@
double
ImageSequenceDialog::frame_rate () const
{
try {
ImageSequenceDialog::frame_rate () const
{
try {
- return
raw
_convert<double> (wx_to_std (_frame_rate->GetValue ()));
+ return
locale
_convert<double> (wx_to_std (_frame_rate->GetValue ()));
} catch (...) {
}
} catch (...) {
}