diff options
| author | Carl Hetherington <cth@carlh.net> | 2021-09-23 23:54:28 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2021-09-27 13:41:46 +0200 |
| commit | 7c05a521d19b2613cfdf698ddc9f88c462ceaf18 (patch) | |
| tree | 5ce64062215b9734388e0acf238ccbd970cf3884 /src/lib | |
| parent | 6e1ceb315f01a233e8c449e649fa44551aa30491 (diff) | |
Make merge return the right alignment even if it's not doing anything.
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/image.cc | 3 |
1 files changed, 2 insertions, 1 deletions
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); |