projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make terminate_threads() less likely to leave _threads containing invalid pointers.
[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 c3b565f3c768ade554b11d622ab6ea1e6896b304..21201faa69264826db4129b7db3eaccb931e10c1 100644
(file)
--- a/
src/lib/raw_image_proxy.cc
+++ b/
src/lib/raw_image_proxy.cc
@@
-55,7
+55,7
@@
RawImageProxy::RawImageProxy (shared_ptr<cxml::Node> xml, shared_ptr<Socket> soc
}
pair<shared_ptr<Image>, int>
}
pair<shared_ptr<Image>, int>
-RawImageProxy::image (optional<dcp::
NoteHandler>, optional<dcp::
Size>) const
+RawImageProxy::image (optional<dcp::Size>) const
{
return make_pair (_image, 0);
}
{
return make_pair (_image, 0);
}
@@
-86,12
+86,6
@@
RawImageProxy::same (shared_ptr<const ImageProxy> other) const
return (*_image.get()) == (*rp->image().first.get());
}
return (*_image.get()) == (*rp->image().first.get());
}
-AVPixelFormat
-RawImageProxy::pixel_format () const
-{
- return _image->pixel_format ();
-}
-
size_t
RawImageProxy::memory_used () const
{
size_t
RawImageProxy::memory_used () const
{