merge from trunk (r12240)

(bzr r11668.1.64)

1 files changed, 2 insertions, 2 deletions

diff --git a/src/extension/internal/image-resolution.cpp b/src/extension/internal/image-resolution.cpp
index 3b3b85d06..51a3fe9c1 100644
--- a/src/extension/internal/image-resolution.cpp
+++ b/src/extension/internal/image-resolution.cpp
@@ -159,10 +159,10 @@ static double exifDouble(ExifEntry *entry, ExifByteOrder byte_order) {
             return double(r.numerator) / double(r.denominator);
         }
         case EXIF_FORMAT_FLOAT: {
-            return double(((float *)entry->data)[0]);
+            return double((reinterpret_cast<float *>(entry->data))[0]);
         }
         case EXIF_FORMAT_DOUBLE: {
-            return ((double *)entry->data)[0];
+            return (reinterpret_cast<double *>(entry->data))[0];
         }
         default: {
             return nan(0);