projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
6e1ceb3
)
Make merge return the right alignment even if it's not doing anything.
author
Carl Hetherington
<cth@carlh.net>
Thu, 23 Sep 2021 21:54:28 +0000
(23:54 +0200)
committer
Carl Hetherington
<cth@carlh.net>
Mon, 27 Sep 2021 11:41:46 +0000
(13:41 +0200)
src/lib/image.cc
patch
|
blob
|
history
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) {
- 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);