summaryrefslogtreecommitdiffstats
path: root/src/extension/internal
diff options
context:
space:
mode:
authorAlex Valavanis <valavanisalex@gmail.com>2013-03-23 16:41:52 +0000
committerAlex Valavanis <valavanisalex@gmail.com>2013-03-23 16:41:52 +0000
commitbaf2d5e96d2455281d4c65ea6331322ce99a2de4 (patch)
treec8f3b74fd8743a1ffe0602c3525341c6da95c5c4 /src/extension/internal
parentExtensions. Fix for old Bug #166697 (Effects dirty document even when they do... (diff)
downloadinkscape-baf2d5e96d2455281d4c65ea6331322ce99a2de4.tar.gz
inkscape-baf2d5e96d2455281d4c65ea6331322ce99a2de4.zip
Convert a couple of C-style pointer casts
(bzr r12237)
Diffstat (limited to 'src/extension/internal')
-rw-r--r--src/extension/internal/cairo-render-context.cpp2
-rw-r--r--src/extension/internal/image-resolution.cpp4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/extension/internal/cairo-render-context.cpp b/src/extension/internal/cairo-render-context.cpp
index b6a58c526..cf6730650 100644
--- a/src/extension/internal/cairo-render-context.cpp
+++ b/src/extension/internal/cairo-render-context.cpp
@@ -708,7 +708,7 @@ CairoRenderContext::popLayer(void)
for (int row = 0 ; row < height; row++) {
unsigned char *row_data = pixels + (row * stride);
for (int i = 0 ; i < width; i++) {
- guint32 *pixel = (guint32 *)row_data + i;
+ guint32 *pixel = reinterpret_cast<guint32 *>(row_data) + i;
float lum_alpha = (((*pixel & 0x00ff0000) >> 16) * coeff_r +
((*pixel & 0x0000ff00) >> 8) * coeff_g +
((*pixel & 0x000000ff) ) * coeff_b );
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);