From: Carl Hetherington <cth@carlh.net>
Date: Sat, 30 Dec 2017 01:47:26 +0000 (+0000)
Subject: Add missing factor to fix problems when padding in subsampled containers; should... 
X-Git-Tag: v2.11.31~2
X-Git-Url: https://git.carlh.net/gitweb/?a=commitdiff_plain;ds=sidebyside;h=e565ceeea3d842373d97ee21d99775ac1dd1269e;p=dcpomatic.git

Add missing factor to fix problems when padding in subsampled containers; should fix #1129.
---

diff --git a/src/lib/image.cc b/src/lib/image.cc
index 92c1ab9a2..a6354f2d1 100644
--- a/src/lib/image.cc
+++ b/src/lib/image.cc
@@ -205,7 +205,7 @@ Image::crop_scale_window (
 
 	uint8_t* scale_out_data[out->planes()];
 	for (int c = 0; c < out->planes(); ++c) {
-		scale_out_data[c] = out->data()[c] + lrintf (out->bytes_per_pixel(c) * corner.x) + out->stride()[c] * corner.y;
+		scale_out_data[c] = out->data()[c] + lrintf (out->bytes_per_pixel(c) * corner.x) + out->stride()[c] * (corner.y / out->vertical_factor(c));
 	}
 
 	sws_scale (