From: Carl Hetherington <cth@carlh.net>
Date: Sun, 19 Sep 2021 20:58:31 +0000 (+0200)
Subject: Check _inter_size in ::has_j2k() (fixes #2086).
X-Git-Tag: v2.15.162~14
X-Git-Url: https://git.carlh.net/gitweb/?a=commitdiff_plain;h=c162f9d8b127f56b8da46b83908000611033e6a5;p=dcpomatic.git

Check _inter_size in ::has_j2k() (fixes #2086).

The example in the bug shrinks a content DCP while keeping the
container the same.  We need to check that neither _out_size nor
_inter_size have changed, to check for scaling/padding.
---

diff --git a/src/lib/player_video.cc b/src/lib/player_video.cc
index d3a286829..b0e75972c 100644
--- a/src/lib/player_video.cc
+++ b/src/lib/player_video.cc
@@ -230,7 +230,7 @@ PlayerVideo::has_j2k () const
 		return false;
 	}
 
-	return _crop == Crop() && _out_size == j2k->size() && !_text && !_fade && !_colour_conversion;
+	return _crop == Crop() && _out_size == j2k->size() && _inter_size == j2k->size() && !_text && !_fade && !_colour_conversion;
 }
 
 shared_ptr<const dcp::Data>