Merge.

1 files changed, 2 insertions, 2 deletions

diff --git a/src/j2k.cc b/src/j2k.cc
index 5fd787f6..f19b5632 100644
--- a/src/j2k.cc
+++ b/src/j2k.cc
@@ -136,8 +136,8 @@ dcp::decompress_j2k (uint8_t* data, int64_t size, int reduce)
 	opj_destroy_codec (decoder);
 	opj_stream_destroy (stream);
 
-	image->x1 = rint (float(image->x1) / pow (2.0, reduce));
-	image->y1 = rint (float(image->y1) / pow (2.0, reduce));
+	image->x1 = rint (float(image->x1) / pow (2.0f, reduce));
+	image->y1 = rint (float(image->y1) / pow (2.0f, reduce));
 	return shared_ptr<OpenJPEGImage> (new OpenJPEGImage (image));
 }