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

diff --git a/src/lib/subtitle.cc b/src/lib/subtitle.cc
index 182e30ed3..b4ac14285 100644
--- a/src/lib/subtitle.cc
+++ b/src/lib/subtitle.cc
@@ -34,7 +34,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)
@@ -55,7 +55,7 @@ TimedSubtitle::TimedSubtitle (AVSubtitle const & sub)
 		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];
@@ -139,7 +139,7 @@ subtitle_transformed_area (
 	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
 {