diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-06-10 15:05:48 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-06-10 15:05:48 +0100 |
| commit | 41ab9a3ad26bb2fd17eca4d99780c46e315c393a (patch) | |
| tree | 67561be4fe87b1e2dd3ae56664baa8c3a033e2aa /src/util.cc | |
| parent | da2cb0bddaaca815440a06884cf3364050e03a0e (diff) | |
Rename XYZImage -> OpenJPEGImage.
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 d972d8ce..cfaeafbe 100644 --- a/src/util.cc +++ b/src/util.cc @@ -25,7 +25,7 @@ #include "exceptions.h" #include "types.h" #include "certificates.h" -#include "xyz_image.h" +#include "openjpeg_image.h" #include "dcp_assert.h" #include "compose.hpp" #include "KM_util.h" @@ -199,9 +199,9 @@ dcp::content_kind_from_string (string kind) * e.g. 0 reduces by (2^0 == 1), ie keeping the same size. * 1 reduces by (2^1 == 2), ie halving the size of the image. * This is useful for scaling 4K DCP images down to 2K. - * @return XYZ image. + * @return OpenJPEGImage. */ -shared_ptr<dcp::XYZImage> +shared_ptr<dcp::OpenJPEGImage> dcp::decompress_j2k (uint8_t* data, int64_t size, int reduce) { uint8_t const jp2_magic[] = { @@ -248,7 +248,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<XYZImage> (new XYZImage (image)); + return shared_ptr<OpenJPEGImage> (new OpenJPEGImage (image)); } /** @param s A string. |