diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-09-11 20:14:27 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-09-11 20:14:27 +0100 |
| commit | 068f2bddb6d926d009aac236d39c4c62b5381286 (patch) | |
| tree | 1659fb5a82a27a234361152d7a50eb5ee9795ba4 /src | |
| parent | 4ca880c8c6f2ba2bfbdf8be8abae08daa5991775 (diff) | |
| parent | 4a79e6ecbc50cac50696791274ae3402b3daa205 (diff) | |
Merge branch '1.0' of ssh://main.carlh.net/home/carl/git/libdcp into 1.0
Diffstat (limited to 'src')
| -rw-r--r-- | src/colour_conversion.h | 1 | ||||
| -rw-r--r-- | src/mono_picture_frame.cc | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/colour_conversion.h b/src/colour_conversion.h index 1e293f78..47071dd1 100644 --- a/src/colour_conversion.h +++ b/src/colour_conversion.h @@ -47,6 +47,7 @@ class ColourConversion { public: ColourConversion () + : _yuv_to_rgb (YUV_TO_RGB_REC601) {} ColourConversion ( diff --git a/src/mono_picture_frame.cc b/src/mono_picture_frame.cc index 7a863463..0a7d7a11 100644 --- a/src/mono_picture_frame.cc +++ b/src/mono_picture_frame.cc @@ -28,6 +28,7 @@ #include "colour_conversion.h" #include "KM_fileio.h" #include "AS_DCP.h" +#include "compose.hpp" #include <openjpeg.h> #define DCI_GAMMA 2.6 @@ -72,7 +73,7 @@ MonoPictureFrame::MonoPictureFrame (boost::filesystem::path path, int n, ASDCP:: _buffer = new ASDCP::JP2K::FrameBuffer (4 * Kumu::Megabyte); if (ASDCP_FAILURE (reader.ReadFrame (n, *_buffer, c))) { - boost::throw_exception (DCPReadError ("could not read video frame")); + boost::throw_exception (DCPReadError (String::compose ("could not read video frame %1 of %2", n, path.string()))); } } |