Merge branch 'master' of ssh://carlh.dnsalias.org/home/carl/git/libdcp
authorCarl Hetherington <cth@carlh.net>
Sat, 27 Oct 2012 00:52:55 +0000 (01:52 +0100)
committerCarl Hetherington <cth@carlh.net>
Sat, 27 Oct 2012 00:52:55 +0000 (01:52 +0100)
src/util.cc

index c5ddb611b4ec0f1eeaadaefcbd9afd0f39ae9f42..2b3a6c8defac8567cb80593e180fc631924c670b 100644 (file)
@@ -189,8 +189,8 @@ 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);
+       image->x1 = rint (float(image->x1) / pow (2, reduce));
+       image->y1 = rint (float(image->y1) / pow (2, reduce));
        return image;
 }