diff options
| author | Carl Hetherington <cth@carlh.net> | 2012-10-17 22:40:08 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2012-10-17 22:40:08 +0100 |
| commit | d6e74fb7dbc5b01c9ce42f8fe780bb16262d13b1 (patch) | |
| tree | 85ec43c83ad755843e6009f29a01edbe4985b5c0 /src/lib/imagemagick_encoder.cc | |
| parent | 988fa33f7d25f2f3319442ce3c9ed661172e4d56 (diff) | |
Re-work FilmState / Film relationship a bit; Film now inherits from FilmState and FilmState does get/set.
Diffstat (limited to 'src/lib/imagemagick_encoder.cc')
| -rw-r--r-- | src/lib/imagemagick_encoder.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/imagemagick_encoder.cc b/src/lib/imagemagick_encoder.cc index 2518f8dc5..082fd13e8 100644 --- a/src/lib/imagemagick_encoder.cc +++ b/src/lib/imagemagick_encoder.cc @@ -53,7 +53,7 @@ ImageMagickEncoder::ImageMagickEncoder (shared_ptr<const FilmState> s, shared_pt void ImageMagickEncoder::process_video (shared_ptr<Image> image, int frame, shared_ptr<Subtitle> sub) { - shared_ptr<Image> scaled = image->scale_and_convert_to_rgb (_opt->out_size, _opt->padding, _fs->scaler); + shared_ptr<Image> scaled = image->scale_and_convert_to_rgb (_opt->out_size, _opt->padding, _fs->scaler()); shared_ptr<Image> compact (new CompactImage (scaled)); string tmp_file = _opt->frame_out_path (frame, true); @@ -63,8 +63,8 @@ ImageMagickEncoder::process_video (shared_ptr<Image> image, int frame, shared_pt filesystem::rename (tmp_file, _opt->frame_out_path (frame, false)); if (sub) { - float const x_scale = float (_opt->out_size.width) / _fs->size.width; - float const y_scale = float (_opt->out_size.height) / _fs->size.height; + float const x_scale = float (_opt->out_size.width) / _fs->size().width; + float const y_scale = float (_opt->out_size.height) / _fs->size().height; string tmp_metadata_file = _opt->frame_out_path (frame, false, ".sub"); ofstream metadata (tmp_metadata_file.c_str ()); @@ -72,7 +72,7 @@ ImageMagickEncoder::process_video (shared_ptr<Image> image, int frame, shared_pt Size new_size = sub->image()->size (); new_size.width *= x_scale; new_size.height *= y_scale; - shared_ptr<Image> scaled = sub->image()->scale (new_size, _fs->scaler); + shared_ptr<Image> scaled = sub->image()->scale (new_size, _fs->scaler()); shared_ptr<Image> compact (new CompactImage (scaled)); string tmp_sub_file = _opt->frame_out_path (frame, true, ".sub.png"); |