From 7c05a521d19b2613cfdf698ddc9f88c462ceaf18 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Thu, 23 Sep 2021 23:54:28 +0200
Subject: [PATCH] Make merge return the right alignment even if it's not doing
 anything.

---
 src/lib/image.cc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/lib/image.cc b/src/lib/image.cc
index 30589ef9c..a4e04bb62 100644
--- a/src/lib/image.cc
+++ b/src/lib/image.cc
@@ -1147,7 +1147,8 @@ merge (list<PositionImage> images, Image::Alignment alignment)
 	}
 
 	if (images.size() == 1) {
-		return images.front ();
+		images.front().image = Image::ensure_alignment(images.front().image, alignment);
+		return images.front();
 	}
 
 	dcpomatic::Rect<int> all (images.front().position, images.front().image->size().width, images.front().image->size().height);
-- 
2.30.2