Fix ID numbering.

[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 8e8bf88248be5bf2b70e2a2f1055283850e6b9b5..e73a1543d34faabe40467f284065e00784bb09ca 100644 (file)
--- 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 <dcp/util.h>
 extern "C" {
 #include <libavutil/pixfmt.h>
 }
 #include <libcxml/cxml.h>
-#include <dcp/util.h>
-#include <dcp/raw_convert.h>
-#include "raw_image_proxy.h"
-#include "image.h"
 
 #include "i18n.h"
 
 using std::string;
 using boost::shared_ptr;
+using boost::optional;
 
 RawImageProxy::RawImageProxy (shared_ptr<Image> image)
        : _image (image)
@@ -48,7 +49,7 @@ RawImageProxy::RawImageProxy (shared_ptr<cxml::Node> xml, shared_ptr<Socket> soc
 }
 
 shared_ptr<Image>
-RawImageProxy::image () const
+RawImageProxy::image (optional<dcp::NoteHandler>) const
 {
        return _image;
 }
@@ -57,9 +58,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<string> (_image->size().width));
-       node->add_child("Height")->add_child_text (dcp::raw_convert<string> (_image->size().height));
-       node->add_child("PixelFormat")->add_child_text (dcp::raw_convert<string> (_image->pixel_format ()));
+       node->add_child("Width")->add_child_text (raw_convert<string> (_image->size().width));
+       node->add_child("Height")->add_child_text (raw_convert<string> (_image->size().height));
+       node->add_child("PixelFormat")->add_child_text (raw_convert<string> (_image->pixel_format ()));
 }
 
 void