diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-11-25 16:06:24 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-11-25 16:06:24 +0000 |
| commit | 9a5b74a15a21e4563db6fb083313d0160eb4a12a (patch) | |
| tree | ecc1a749a07b13963867a2665eeb449f3664952d /src | |
| parent | 7e52c0c76f280c78218fde11906eb1407d360c4b (diff) | |
Undo previous guess; try passing UTF-16 to Magick::Image constructor.
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/still_image_examiner.cc | 2 | ||||
| -rw-r--r-- | src/wx/film_editor.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/still_image_examiner.cc b/src/lib/still_image_examiner.cc index 5f45d6365..181a52654 100644 --- a/src/lib/still_image_examiner.cc +++ b/src/lib/still_image_examiner.cc @@ -33,7 +33,7 @@ StillImageExaminer::StillImageExaminer (shared_ptr<const Film> f, shared_ptr<con , _film (f) { using namespace MagickCore; - Magick::Image* image = new Magick::Image (_still_image_content->path().string()); + Magick::Image* image = new Magick::Image (_still_image_content->path().c_str ()); _video_size = libdcp::Size (image->columns(), image->rows()); delete image; } diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc index 201bfa87a..b3b5242b2 100644 --- a/src/wx/film_editor.cc +++ b/src/wx/film_editor.cc @@ -745,7 +745,7 @@ FilmEditor::content_add_file_clicked () /* XXX: check for lots of files here and do something */ for (unsigned int i = 0; i < paths.GetCount(); ++i) { - _film->examine_and_add_content (content_factory (_film, paths[i].utf8_str().data ())); + _film->examine_and_add_content (content_factory (_film, wx_to_std (d->GetPath ()))); } } |