projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
std::shared_ptr
[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 084f515ed5f6a9dd2b77da56b0b0bd102561098d..667f25b0603f99771f69ba00ac04428c745acaae 100644
(file)
--- a/
src/lib/raw_image_proxy.cc
+++ b/
src/lib/raw_image_proxy.cc
@@
-20,21
+20,24
@@
#include "raw_image_proxy.h"
#include "image.h"
#include "raw_image_proxy.h"
#include "image.h"
+#include "warnings.h"
#include <dcp/raw_convert.h>
#include <dcp/util.h>
#include <libcxml/cxml.h>
extern "C" {
#include <libavutil/pixfmt.h>
}
#include <dcp/raw_convert.h>
#include <dcp/util.h>
#include <libcxml/cxml.h>
extern "C" {
#include <libavutil/pixfmt.h>
}
+DCPOMATIC_DISABLE_WARNINGS
#include <libxml++/libxml++.h>
#include <libxml++/libxml++.h>
+DCPOMATIC_ENABLE_WARNINGS
#include "i18n.h"
using std::string;
using std::pair;
using std::make_pair;
#include "i18n.h"
using std::string;
using std::pair;
using std::make_pair;
-using
boost
::shared_ptr;
-using
boost
::dynamic_pointer_cast;
+using
std
::shared_ptr;
+using
std
::dynamic_pointer_cast;
using boost::optional;
using dcp::raw_convert;
using boost::optional;
using dcp::raw_convert;
@@
-54,10
+57,10
@@
RawImageProxy::RawImageProxy (shared_ptr<cxml::Node> xml, shared_ptr<Socket> soc
_image->read_from_socket (socket);
}
_image->read_from_socket (socket);
}
-pair<shared_ptr<Image>, int>
-RawImageProxy::image (optional<dcp::
NoteHandler>, optional<dcp::
Size>) const
+ImageProxy::Result
+RawImageProxy::image (optional<dcp::Size>) const
{
{
- return
make_pair
(_image, 0);
+ return
Result
(_image, 0);
}
void
}
void
@@
-70,7
+73,7
@@
RawImageProxy::add_metadata (xmlpp::Node* node) const
}
void
}
void
-RawImageProxy::
send_binary
(shared_ptr<Socket> socket) const
+RawImageProxy::
write_to_socket
(shared_ptr<Socket> socket) const
{
_image->write_to_socket (socket);
}
{
_image->write_to_socket (socket);
}
@@
-83,7
+86,7
@@
RawImageProxy::same (shared_ptr<const ImageProxy> other) const
return false;
}
return false;
}
- return (*_image.get()) == (*rp->image().
first
.get());
+ return (*_image.get()) == (*rp->image().
image
.get());
}
size_t
}
size_t