Fix up image sizes when direct-reducing JPEG2000.

[libdcp.git] / src / util.cc

diff --git a/src/util.cc b/src/util.cc
index 4434b98ce11cfca884296436e48c54ff15c2a564..ad6a66fec30e04fa7870e05669f233b39a52258e 100644 (file)
--- a/src/util.cc
+++ b/src/util.cc
@@ -175,6 +175,9 @@ libdcp::decompress_j2k (uint8_t* data, int64_t size, int reduce)
        }
 
        opj_cio_close (cio);
+
+       image->x1 /= pow (2, reduce);
+       image->y1 /= pow (2, reduce);
        return image;
 }
 
@@ -194,13 +197,13 @@ libdcp::xyz_to_rgb (opj_image_t* xyz_frame)
        int* xyz_z = xyz_frame->comps[2].data;
 
        shared_ptr<ARGBFrame> argb_frame (new ARGBFrame (xyz_frame->x1, xyz_frame->y1));
-       
+
        uint8_t* argb = argb_frame->data ();
        
        for (int y = 0; y < xyz_frame->y1; ++y) {
                uint8_t* argb_line = argb;
                for (int x = 0; x < xyz_frame->x1; ++x) {
-                       
+
                        assert (*xyz_x >= 0 && *xyz_y >= 0 && *xyz_z >= 0 && *xyz_x < 4096 && *xyz_x < 4096 && *xyz_z < 4096);
                        
                        /* In gamma LUT */