Merge.

[dcpomatic.git] / src / lib / dcp_examiner.cc

diff --git a/src/lib/dcp_examiner.cc b/src/lib/dcp_examiner.cc
index 1e4cc899df96df614fd6a9b1413d3101245247a4..9dbac14d0240bda279a826d25e4ef20bb82c5c64 100644 (file)
--- a/src/lib/dcp_examiner.cc
+++ b/src/lib/dcp_examiner.cc
@@ -17,6 +17,11 @@
 
 */
 
+#include "dcp_examiner.h"
+#include "dcp_content.h"
+#include "exceptions.h"
+#include "image.h"
+#include "config.h"
 #include <dcp/dcp.h>
 #include <dcp/cpl.h>
 #include <dcp/reel.h>
@@ -27,11 +32,6 @@
 #include <dcp/stereo_picture_mxf.h>
 #include <dcp/stereo_picture_frame.h>
 #include <dcp/sound_mxf.h>
-#include "dcp_examiner.h"
-#include "dcp_content.h"
-#include "exceptions.h"
-#include "image.h"
-#include "config.h"
 
 #include "i18n.h"
 
@@ -117,12 +117,10 @@ DCPExaminer::DCPExaminer (shared_ptr<const DCPContent> content)
                        shared_ptr<dcp::MonoPictureMXF> mono = dynamic_pointer_cast<dcp::MonoPictureMXF> (mxf);
                        shared_ptr<dcp::StereoPictureMXF> stereo = dynamic_pointer_cast<dcp::StereoPictureMXF> (mxf);
                        
-                       shared_ptr<Image> image (new Image (PIX_FMT_RGB24, _video_size.get(), false));
-                       
                        if (mono) {
-                               mono->get_frame(0)->rgb_frame (image->data()[0]);
+                               mono->get_frame(0)->xyz_image ();
                        } else {
-                               stereo->get_frame(0)->rgb_frame (dcp::EYE_LEFT, image->data()[0]);
+                               stereo->get_frame(0)->xyz_image (dcp::EYE_LEFT);
                        }
                        
                }