diff options
| author | Jabier Arraiza Cenoz <jabier.arraiza@marker.es> | 2013-03-23 19:10:43 +0000 |
|---|---|---|
| committer | Jabiertxo Arraiza Zenotz <jtx@jtx.marker.es> | 2013-03-23 19:10:43 +0000 |
| commit | 9ce7b44f0e1537769ea50f85675341c42fd18a3d (patch) | |
| tree | ef5233514dc7cda13091e401d25ed5a09278af1c /src/extension/internal/image-resolution.cpp | |
| parent | Fix weight 0 by widget now give a full cusp node (diff) | |
| parent | Convert a couple of C-style pointer casts (diff) | |
| download | inkscape-9ce7b44f0e1537769ea50f85675341c42fd18a3d.tar.gz inkscape-9ce7b44f0e1537769ea50f85675341c42fd18a3d.zip | |
Update to trunk
(bzr r11950.1.71)
Diffstat (limited to 'src/extension/internal/image-resolution.cpp')
| -rw-r--r-- | src/extension/internal/image-resolution.cpp | 4 |
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); |