projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Various alignment adjustments.
[dcpomatic.git]
/
src
/
lib
/
raw_image_proxy.cc
diff --git
a/src/lib/raw_image_proxy.cc
b/src/lib/raw_image_proxy.cc
index fed40c45e7ec783faaa31fa94b55f91810177dc2..ac8ff0763d103556b20b649574bad94515171f04 100644
(file)
--- a/
src/lib/raw_image_proxy.cc
+++ b/
src/lib/raw_image_proxy.cc
@@
-64,9
+64,10
@@
RawImageProxy::RawImageProxy (shared_ptr<cxml::Node> xml, shared_ptr<Socket> soc
ImageProxy::Result
ImageProxy::Result
-RawImageProxy::image (optional<dcp::Size>) const
+RawImageProxy::image (
bool aligned,
optional<dcp::Size>) const
{
{
- return Result (_image, 0);
+ /* This ensure_aligned could be wasteful */
+ return Result (Image::ensure_aligned(_image, aligned), 0);
}
}
@@
-95,7
+96,7
@@
RawImageProxy::same (shared_ptr<const ImageProxy> other) const
return false;
}
return false;
}
- return (*_image.get()) == (*rp->image().image.get());
+ return (*_image.get()) == (*rp->image(
_image->aligned()
).image.get());
}
}