diff options
| author | su_v <suv-sf@users.sourceforge.net> | 2013-03-24 13:34:25 +0000 |
|---|---|---|
| committer | ~suv <suv-sf@users.sourceforge.net> | 2013-03-24 13:34:25 +0000 |
| commit | f21aff51cc69c54b295d19c2fa5b152debed8556 (patch) | |
| tree | 959be6c936792b4c8dd8504b49a1c6b85eceb6b6 /src/display | |
| parent | merge from trunk (r1228) (diff) | |
| parent | German translation update (diff) | |
| download | inkscape-f21aff51cc69c54b295d19c2fa5b152debed8556.tar.gz inkscape-f21aff51cc69c54b295d19c2fa5b152debed8556.zip | |
merge from trunk (r12240)
(bzr r11668.1.64)
Diffstat (limited to 'src/display')
| -rw-r--r-- | src/display/cairo-templates.h | 12 | ||||
| -rw-r--r-- | src/display/drawing-image.cpp | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/display/cairo-templates.h b/src/display/cairo-templates.h index 45b6790e6..57ec98f81 100644 --- a/src/display/cairo-templates.h +++ b/src/display/cairo-templates.h @@ -66,9 +66,9 @@ void ink_cairo_surface_blend(cairo_surface_t *in1, cairo_surface_t *in2, cairo_s int limit = w * h; - guint32 *const in1_data = (guint32*) cairo_image_surface_get_data(in1); - guint32 *const in2_data = (guint32*) cairo_image_surface_get_data(in2); - guint32 *const out_data = (guint32*) cairo_image_surface_get_data(out); + guint32 *const in1_data = reinterpret_cast<guint32*>(cairo_image_surface_get_data(in1)); + guint32 *const in2_data = reinterpret_cast<guint32*>(cairo_image_surface_get_data(in2)); + guint32 *const out_data = reinterpret_cast<guint32*>(cairo_image_surface_get_data(out)); // NOTE // OpenMP probably doesn't help much here. @@ -199,8 +199,8 @@ void ink_cairo_surface_filter(cairo_surface_t *in, cairo_surface_t *out, Filter fast_path &= (stridein == w * bppin); fast_path &= (strideout == w * bppout); - guint32 *const in_data = (guint32*) cairo_image_surface_get_data(in); - guint32 *const out_data = (guint32*) cairo_image_surface_get_data(out); + guint32 *const in_data = reinterpret_cast<guint32*>(cairo_image_surface_get_data(in)); + guint32 *const out_data = reinterpret_cast<guint32*>(cairo_image_surface_get_data(out)); #if HAVE_OPENMP Inkscape::Preferences *prefs = Inkscape::Preferences::get(); @@ -695,4 +695,4 @@ pxclamp(gint32 v, gint32 low, gint32 high) { fill-column:99 End: */ -// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99 : +// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 : diff --git a/src/display/drawing-image.cpp b/src/display/drawing-image.cpp index 2bfd71713..3f1a86ee7 100644 --- a/src/display/drawing-image.cpp +++ b/src/display/drawing-image.cpp @@ -22,8 +22,8 @@ DrawingImage::DrawingImage(Drawing &drawing) : DrawingItem(drawing) , _pixbuf(NULL) , _surface(NULL) - , _new_surface(NULL) , _style(NULL) + , _new_surface(NULL) {} DrawingImage::~DrawingImage() |