Make merge return the right alignment even if it's not doing anything.

diff --git a/src/lib/image.cc b/src/lib/image.cc
index 30589ef9cc5dc784ae5f948ebb2b84f824f0cd1d..a4e04bb626d5a146e0cd0405aa94eec850feb5c7 100644 (file)
--- 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) {
        }
 
        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);
        }
 
        dcpomatic::Rect<int> all (images.front().position, images.front().image->size().width, images.front().image->size().height);