Merge master.

[dcpomatic.git] / src / lib / image.cc

diff --git a/src/lib/image.cc b/src/lib/image.cc
index a12c61b3e8a9ce3992d5641d351926481e818361..f0a38f4e9418bdd941f86950279e4962434de779 100644 (file)
--- a/src/lib/image.cc
+++ b/src/lib/image.cc
@@ -68,7 +68,7 @@ Image::lines (int n) const
                throw PixelFormatError (N_("lines()"), _pixel_format);
        }
        
-       return size().height / pow(2, d->log2_chroma_h);
+       return size().height / pow(2.0f, d->log2_chroma_h);
 }
 
 /** @return Number of components */
@@ -407,13 +407,13 @@ Image::bytes_per_pixel (int c) const
 
        bpp[0] = floor ((d->comp[0].depth_minus1 + 1 + 7) / 8);
        if (d->nb_components > 1) {
-               bpp[1] = floor ((d->comp[1].depth_minus1 + 1 + 7) / 8) / pow (2, d->log2_chroma_w);
+               bpp[1] = floor ((d->comp[1].depth_minus1 + 1 + 7) / 8) / pow (2.0f, d->log2_chroma_w);
        }
        if (d->nb_components > 2) {
-               bpp[2] = floor ((d->comp[2].depth_minus1 + 1 + 7) / 8) / pow (2, d->log2_chroma_w);
+               bpp[2] = floor ((d->comp[2].depth_minus1 + 1 + 7) / 8) / pow (2.0f, d->log2_chroma_w);
        }
        if (d->nb_components > 3) {
-               bpp[3] = floor ((d->comp[3].depth_minus1 + 1 + 7) / 8) / pow (2, d->log2_chroma_w);
+               bpp[3] = floor ((d->comp[3].depth_minus1 + 1 + 7) / 8) / pow (2.0f, d->log2_chroma_w);
        }
        
        if ((d->flags & PIX_FMT_PLANAR) == 0) {