projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Replace aligned bool with enum Alignment.
[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..fb0d16df8a5b6cc29cef87a5054d85ccdc8dec5e 100644
(file)
--- a/
src/lib/raw_image_proxy.cc
+++ b/
src/lib/raw_image_proxy.cc
@@
-58,15
+58,16
@@
RawImageProxy::RawImageProxy (shared_ptr<cxml::Node> xml, shared_ptr<Socket> soc
xml->number_child<int>("Width"), xml->number_child<int>("Height")
);
xml->number_child<int>("Width"), xml->number_child<int>("Height")
);
- _image = make_shared<Image>(static_cast<AVPixelFormat>(xml->number_child<int>("PixelFormat")), size,
true
);
+ _image = make_shared<Image>(static_cast<AVPixelFormat>(xml->number_child<int>("PixelFormat")), size,
Image::Alignment::PADDED
);
_image->read_from_socket (socket);
}
ImageProxy::Result
_image->read_from_socket (socket);
}
ImageProxy::Result
-RawImageProxy::image (optional<dcp::Size>) const
+RawImageProxy::image (
Image::Alignment alignment,
optional<dcp::Size>) const
{
{
- return Result (_image, 0);
+ /* This ensure_alignment could be wasteful */
+ return Result (Image::ensure_alignment(_image, alignment), 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->alignment()
).image.get());
}
}