diff options
| author | Carl Hetherington <cth@carlh.net> | 2012-10-24 22:13:53 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2012-10-24 22:13:53 +0100 |
| commit | 63ea6b6c5ee64f8ee067c2b488d004b6dfe363e0 (patch) | |
| tree | d248762556466fd076cfd20f2e6aa1d5d9544184 /src/lib/imagemagick_encoder.cc | |
| parent | 977b36672892b14de4ecb68e98415c64946e8a93 (diff) | |
Use boost::signals2; fix bugs with x-thread signalling.
Diffstat (limited to 'src/lib/imagemagick_encoder.cc')
| -rw-r--r-- | src/lib/imagemagick_encoder.cc | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/lib/imagemagick_encoder.cc b/src/lib/imagemagick_encoder.cc index e86888c36..8d42b3dbe 100644 --- a/src/lib/imagemagick_encoder.cc +++ b/src/lib/imagemagick_encoder.cc @@ -36,8 +36,9 @@ #include "image.h" #include "subtitle.h" -using namespace std; -using namespace boost; +using std::string; +using std::ofstream; +using boost::shared_ptr; /** @param f Film that we are encoding. * @param o Options. @@ -58,7 +59,7 @@ ImageMagickEncoder::process_video (shared_ptr<Image> image, int frame, shared_pt Magick::Image thumb (compact->size().width, compact->size().height, "RGB", MagickCore::CharPixel, compact->data()[0]); thumb.magick ("PNG"); thumb.write (tmp_file); - filesystem::rename (tmp_file, _opt->frame_out_path (frame, false)); + boost::filesystem::rename (tmp_file, _opt->frame_out_path (frame, false)); if (sub) { float const x_scale = float (_opt->out_size.width) / _film->size().width; @@ -77,13 +78,13 @@ ImageMagickEncoder::process_video (shared_ptr<Image> image, int frame, shared_pt Magick::Image sub_thumb (compact->size().width, compact->size().height, "RGBA", MagickCore::CharPixel, compact->data()[0]); sub_thumb.magick ("PNG"); sub_thumb.write (tmp_sub_file); - filesystem::rename (tmp_sub_file, _opt->frame_out_path (frame, false, ".sub.png")); + boost::filesystem::rename (tmp_sub_file, _opt->frame_out_path (frame, false, ".sub.png")); metadata << "x " << sub->position().x << "\n" << "y " << sub->position().y << "\n"; metadata.close (); - filesystem::rename (tmp_metadata_file, _opt->frame_out_path (frame, false, ".sub")); + boost::filesystem::rename (tmp_metadata_file, _opt->frame_out_path (frame, false, ".sub")); } frame_done (frame); |