No-op: whitespace.

[libdcp.git] / src / mono_picture_frame.cc

diff --git a/src/mono_picture_frame.cc b/src/mono_picture_frame.cc
index 1edfd4119575e13b552ce239c9b8c96da4eac54a..7a8634635769903eb8533da72a8ed16de5e6d24f 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_image.h"
 #include "util.h"
 #include "rgb_xyz.h"
 #include "colour_conversion.h"
@@ -45,7 +44,7 @@ MonoPictureFrame::MonoPictureFrame (boost::filesystem::path path)
 {
        boost::uintmax_t const size = boost::filesystem::file_size (path);
        _buffer = new ASDCP::JP2K::FrameBuffer (size);
-       FILE* f = fopen_boost (path, "r");
+       FILE* f = fopen_boost (path, "rb");
        if (!f) {
                boost::throw_exception (FileError ("could not open JPEG2000 file", path, errno));
        }
@@ -57,16 +56,16 @@ MonoPictureFrame::MonoPictureFrame (boost::filesystem::path path)
 }
 
 /** Make a picture frame from a 2D (monoscopic) asset.
- *  @param mxf_path Path to the asset's MXF file.
+ *  @param path Path to the asset's MXF file.
  *  @param n Frame within the asset, not taking EntryPoint into account.
  *  @param c Context for decryption, or 0.
  */
-MonoPictureFrame::MonoPictureFrame (boost::filesystem::path mxf_path, int n, ASDCP::AESDecContext* c)
+MonoPictureFrame::MonoPictureFrame (boost::filesystem::path path, int n, ASDCP::AESDecContext* c)
 {
        ASDCP::JP2K::MXFReader reader;
-       Kumu::Result_t r = reader.OpenRead (mxf_path.string().c_str());
+       Kumu::Result_t r = reader.OpenRead (path.string().c_str());
        if (ASDCP_FAILURE (r)) {
-               boost::throw_exception (FileError ("could not open MXF file for reading", mxf_path, r));
+               boost::throw_exception (FileError ("could not open MXF file for reading", path, r));
        }
 
        /* XXX: unfortunate guesswork on this buffer size */
@@ -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<ARGBImage>
-MonoPictureFrame::argb_image (int reduce) const
+shared_ptr<OpenJPEGImage>
+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 (shared_ptr<Image> rgb, optional<NoteHandler> note) const
-{
-       xyz_to_rgb (
-               decompress_j2k (const_cast<uint8_t*> (_buffer->RoData()), _buffer->Size(), 0),
-               ColourConversion::xyz_to_srgb (),
-               rgb,
-               note
-               );
+       return decompress_j2k (const_cast<uint8_t*> (_buffer->RoData()), _buffer->Size(), reduce);
 }