X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fimagemagick_encoder.cc;h=082fd13e8dd52f4b77f02b9752289d4ed6145173;hb=44b57d623dec97a3f9955082f0b8a7a8d27b7518;hp=9bd8162f89406cf54b446f0d7e290817d223bfbb;hpb=43990add893eccf350f280e2dd3f947a94f3e9aa;p=dcpomatic.git

diff --git a/src/lib/imagemagick_encoder.cc b/src/lib/imagemagick_encoder.cc
index 9bd8162f8..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,38 +63,29 @@ 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 ());
 		
-		list<shared_ptr<SubtitleImage> > images = sub->images ();
-		int n = 0;
-		for (list<shared_ptr<SubtitleImage> >::iterator i = images.begin(); i != images.end(); ++i) {
-			stringstream ext;
-			ext << ".sub." << n << ".png";
-
-			Size new_size = (*i)->image()->size ();
-			new_size.width *= x_scale;
-			new_size.height *= y_scale;
-			shared_ptr<Image> scaled = (*i)->image()->scale (new_size, _fs->scaler);
-			shared_ptr<Image> compact (new CompactImage (scaled));
-			
-			string tmp_sub_file = _opt->frame_out_path (frame, true, ext.str ());
-			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, ext.str ()));
-
-			metadata << "image " << n << "\n"
-				 << "x " << (*i)->position().x << "\n"
-				 << "y " << (*i)->position().y << "\n";
+		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> compact (new CompactImage (scaled));
+		
+		string tmp_sub_file = _opt->frame_out_path (frame, true, ".sub.png");
+		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"));
 
-			metadata.close ();
-			filesystem::rename (tmp_metadata_file, _opt->frame_out_path (frame, false, ".sub"));
-		}
+		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"));
 	}
 	
 	frame_done (frame);