Remove Image and ARGBImage and just dump RGB data into

[libdcp.git] / src / mono_picture_frame.cc

diff --git a/src/mono_picture_frame.cc b/src/mono_picture_frame.cc
index 617d46875821f940af2f6bb00eb33d08f3fc11dd..689a8b21f6c199b6ce6d7fb39cacd94c43161607 100644 (file)
--- a/src/mono_picture_frame.cc
+++ b/src/mono_picture_frame.cc
@@ -23,7 +23,6 @@
 
 #include "mono_picture_frame.h"
 #include "exceptions.h"
-#include "argb_frame.h"
 #include "util.h"
 #include "rgb_xyz.h"
 #include "colour_conversion.h"
@@ -112,29 +111,9 @@ MonoPictureFrame::j2k_size () const
 /** @param reduce a factor by which to reduce the resolution
  *  of the image, expressed as a power of two (pass 0 for no
  *  reduction).
- *  @param srgb_gamma Reciprocal of output gamma to use after
- *  the conversion from XYZ to RGB.
- *
- *  @return An ARGB representation of this frame.  This is ARGB in the
- *  Cairo sense, so that each pixel takes up 4 bytes; the first byte
- *  is blue, second green, third red and fourth alpha (always 255).
  */
-shared_ptr<ARGBFrame>
-MonoPictureFrame::argb_frame (int reduce, float srgb_gamma) const
+shared_ptr<XYZImage>
+MonoPictureFrame::xyz_image (int reduce) const
 {
-       return xyz_to_rgba (
-               decompress_j2k (const_cast<uint8_t*> (_buffer->RoData()), _buffer->Size(), reduce),
-               ColourConversion::xyz_to_srgb ()
-               );
-}
-
-void
-MonoPictureFrame::rgb_frame (uint16_t* buffer, optional<NoteHandler> note) const
-{
-       xyz_to_rgb (
-               decompress_j2k (const_cast<uint8_t*> (_buffer->RoData()), _buffer->Size(), 0),
-               ColourConversion::xyz_to_srgb (),
-               buffer,
-               note
-               );
+       return decompress_j2k (const_cast<uint8_t*> (_buffer->RoData()), _buffer->Size(), reduce);
 }