diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-02-02 19:25:43 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-02-02 19:25:43 +0000 |
| commit | 0d7fe66361a40702cb97357955cf35256f1d2c26 (patch) | |
| tree | 5cc44b13cbe6e257cb422ba9d79d1c385234495c /src/util.cc | |
| parent | 1dc082f3295f64a9fd4a103078a1dbb5121a865d (diff) | |
Rename XYZFrame -> XYZImage and ARGBFrame -> ARGBImage.
Diffstat (limited to 'src/util.cc')
| -rw-r--r-- | src/util.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/util.cc b/src/util.cc index ac067a76..89b563ae 100644 --- a/src/util.cc +++ b/src/util.cc @@ -24,9 +24,9 @@ #include "util.h" #include "exceptions.h" #include "types.h" -#include "argb_frame.h" +#include "argb_image.h" #include "certificates.h" -#include "xyz_frame.h" +#include "xyz_image.h" #include "dcp_assert.h" #include "compose.hpp" #include "KM_util.h" @@ -202,7 +202,7 @@ dcp::content_kind_from_string (string kind) * This is useful for scaling 4K DCP images down to 2K. * @return XYZ image. */ -shared_ptr<dcp::XYZFrame> +shared_ptr<dcp::XYZImage> dcp::decompress_j2k (uint8_t* data, int64_t size, int reduce) { opj_dinfo_t* decoder = opj_create_decompress (CODEC_J2K); @@ -223,7 +223,7 @@ dcp::decompress_j2k (uint8_t* data, int64_t size, int reduce) image->x1 = rint (float(image->x1) / pow (2, reduce)); image->y1 = rint (float(image->y1) / pow (2, reduce)); - return shared_ptr<XYZFrame> (new XYZFrame (image)); + return shared_ptr<XYZImage> (new XYZImage (image)); } /** @param s A string. |