From: Carl Hetherington <cth@carlh.net>
Date: Sun, 21 Oct 2012 12:43:59 +0000 (+0100)
Subject: Fix up subtitle positioning under crop.
X-Git-Tag: v2.0.48~1674
X-Git-Url: https://git.carlh.net/gitweb/?a=commitdiff_plain;h=cc8973de75b9c484decac5f6e13fcba62658b8e6;p=dcpomatic.git

Fix up subtitle positioning under crop.
---

diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc
index f029a1a38..8c1ce34e0 100644
--- a/src/wx/film_viewer.cc
+++ b/src/wx/film_viewer.cc
@@ -182,8 +182,8 @@ private:
 
 			_subtitle->transformed_image = _subtitle->base_image;
 			_subtitle->transformed_image.Rescale (_subtitle->transformed_area.width, _subtitle->transformed_area.height, wxIMAGE_QUALITY_HIGH);
-			_subtitle->transformed_area.x -= _film->crop().left;
-			_subtitle->transformed_area.y -= _film->crop().top;
+			_subtitle->transformed_area.x -= rint (_film->crop().left * x_scale);
+			_subtitle->transformed_area.y -= rint (_film->crop().top * y_scale);
 			_subtitle->bitmap.reset (new wxBitmap (_subtitle->transformed_image));
 		}
 	}