X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fraw_image_proxy.cc;h=c9a76e85a2d6da0e06fa198edef22bba40a14974;hb=34a335c9f17e736de4aaa136b9d799616d7b73ae;hp=8f05f54558301e45f895a338b5e74738e48e006e;hpb=77f7f3be256f81d2977bccdb236582e18a625ba7;p=dcpomatic.git diff --git a/src/lib/raw_image_proxy.cc b/src/lib/raw_image_proxy.cc index 8f05f5455..c9a76e85a 100644 --- a/src/lib/raw_image_proxy.cc +++ b/src/lib/raw_image_proxy.cc @@ -17,19 +17,20 @@ */ +#include "raw_image_proxy.h" +#include "image.h" +#include "raw_convert.h" +#include extern "C" { #include } #include -#include -#include -#include "raw_image_proxy.h" -#include "image.h" #include "i18n.h" using std::string; using boost::shared_ptr; +using boost::dynamic_pointer_cast; using boost::optional; RawImageProxy::RawImageProxy (shared_ptr image) @@ -58,9 +59,9 @@ void RawImageProxy::add_metadata (xmlpp::Node* node) const { node->add_child("Type")->add_child_text (N_("Raw")); - node->add_child("Width")->add_child_text (dcp::raw_convert (_image->size().width)); - node->add_child("Height")->add_child_text (dcp::raw_convert (_image->size().height)); - node->add_child("PixelFormat")->add_child_text (dcp::raw_convert (_image->pixel_format ())); + node->add_child("Width")->add_child_text (raw_convert (_image->size().width)); + node->add_child("Height")->add_child_text (raw_convert (_image->size().height)); + node->add_child("PixelFormat")->add_child_text (raw_convert (_image->pixel_format ())); } void @@ -68,3 +69,14 @@ RawImageProxy::send_binary (shared_ptr socket) const { _image->write_to_socket (socket); } + +bool +RawImageProxy::same (shared_ptr other) const +{ + shared_ptr rp = dynamic_pointer_cast (other); + if (!rp) { + return false; + } + + return (*_image.get()) == (*rp->image().get()); +}