X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fsubtitle.cc;h=5c1ad97064fd1042450b99638d21de8a62f049b5;hb=ba0a895137b630f5d308b123ef886d68090f855d;hp=182e30ed398cb598e59936cf7ac39211bdf7e0df;hpb=0330d9b2924767d9240c5a25e9ed4327eb0a73bd;p=dcpomatic.git

diff --git a/src/lib/subtitle.cc b/src/lib/subtitle.cc
index 182e30ed3..5c1ad9706 100644
--- a/src/lib/subtitle.cc
+++ b/src/lib/subtitle.cc
@@ -25,8 +25,11 @@
 #include "image.h"
 #include "exceptions.h"
 
+#include "i18n.h"
+
 using namespace std;
 using namespace boost;
+using libdcp::Size;
 
 /** Construct a TimedSubtitle.  This is a subtitle image, position,
  *  and a range of time over which it should be shown.
@@ -34,7 +37,7 @@ using namespace boost;
  */
 TimedSubtitle::TimedSubtitle (AVSubtitle const & sub)
 {
-	assert (sub.rects > 0);
+	assert (sub.num_rects > 0);
 	
 	/* Subtitle PTS in seconds (within the source, not taking into account any of the
 	   source that we may have chopped off for the DCP)
@@ -46,16 +49,16 @@ TimedSubtitle::TimedSubtitle (AVSubtitle const & sub)
 	_to = packet_time + (double (sub.end_display_time) / 1e3);
 
 	if (sub.num_rects > 1) {
-		throw DecodeError ("multi-part subtitles not yet supported");
+		throw DecodeError (_("multi-part subtitles not yet supported"));
 	}
 
 	AVSubtitleRect const * rect = sub.rects[0];
 
 	if (rect->type != SUBTITLE_BITMAP) {
-		throw DecodeError ("non-bitmap subtitles not yet supported");
+		throw DecodeError (_("non-bitmap subtitles not yet supported"));
 	}
 	
-	shared_ptr<Image> image (new SimpleImage (PIX_FMT_RGBA, Size (rect->w, rect->h), true));
+	shared_ptr<Image> image (new SimpleImage (PIX_FMT_RGBA, libdcp::Size (rect->w, rect->h), true));
 
 	/* Start of the first line in the subtitle */
 	uint8_t* sub_p = rect->pict.data[0];
@@ -133,13 +136,13 @@ subtitle_transformed_area (
 	 * Combining these two translations gives these expressions.
 	 */
 	
-	tx.x = target_x_scale * (sub_area.x + (sub_area.width * (1 - subtitle_scale) / 2));
-	tx.y = target_y_scale * (sub_area.y + (sub_area.height * (1 - subtitle_scale) / 2));
+	tx.x = rint (target_x_scale * (sub_area.x + (sub_area.width * (1 - subtitle_scale) / 2)));
+	tx.y = rint (target_y_scale * (sub_area.y + (sub_area.height * (1 - subtitle_scale) / 2)));
 
 	return tx;
 }
 
-/** @return area that this subtitle take up, in the original uncropped source's coordinate space */
+/** @return area that this subtitle takes up, in the original uncropped source's coordinate space */
 Rect
 Subtitle::area () const
 {