From 136a8737897b8340def4bb09a85d12824d9b50bd Mon Sep 17 00:00:00 2001 From: su_v Date: Tue, 25 Sep 2012 22:34:14 +0200 Subject: revert changes not strictly required for EMF support (bzr r11668.1.12) --- src/sp-image.cpp | 1 - src/style.cpp | 4 +--- src/ui/tool/path-manipulator.cpp | 6 ++---- 3 files changed, 3 insertions(+), 8 deletions(-) (limited to 'src') diff --git a/src/sp-image.cpp b/src/sp-image.cpp index 39e37ebc8..07885ff4d 100644 --- a/src/sp-image.cpp +++ b/src/sp-image.cpp @@ -1119,7 +1119,6 @@ static void sp_image_print( SPItem *item, SPPrintContext *ctx ) t = ti * t; sp_print_image_R8G8B8A8_N(ctx, px + trimx*pixskip + trimy*rs, trimwidth, trimheight, rs, t, item->style); } - free(px); // else big memory leak on each image print! } } diff --git a/src/style.cpp b/src/style.cpp index ab8b646aa..616474298 100644 --- a/src/style.cpp +++ b/src/style.cpp @@ -1236,9 +1236,7 @@ sp_style_merge_property(SPStyle *style, gint id, gchar const *val) case SP_PROP_COLOR_INTERPOLATION_FILTERS: // We read it but issue warning SPS_READ_IENUM_IF_UNSET(&style->color_interpolation_filters, val, enum_color_interpolation, true); - static bool blab=true; // eliminate annoying repeated messages to console - if( blab && style->color_interpolation_filters.value != SP_CSS_COLOR_INTERPOLATION_SRGB ) { - blab = false; + if( style->color_interpolation_filters.value != SP_CSS_COLOR_INTERPOLATION_SRGB ) { g_warning("Inkscape currently only supports color-interpolation-filters = sRGB"); } break; diff --git a/src/ui/tool/path-manipulator.cpp b/src/ui/tool/path-manipulator.cpp index 8a5a79ec3..35eb23f42 100644 --- a/src/ui/tool/path-manipulator.cpp +++ b/src/ui/tool/path-manipulator.cpp @@ -949,12 +949,10 @@ void PathManipulator::hideDragPoint() * at the given time value */ NodeList::iterator PathManipulator::subdivideSegment(NodeList::iterator first, double t) { - //throw originally used std::invalid_argument, that caused a link error against static libstdc++, - //this form was only used here. - if (!first) throw "Subdivide after invalid iterator"; + if (!first) throw std::invalid_argument("Subdivide after invalid iterator"); NodeList &list = NodeList::get(first); NodeList::iterator second = first.next(); - if (!second) throw "Subdivide after last node in open path"; + if (!second) throw std::invalid_argument("Subdivide after last node in open path"); // We need to insert the segment after 'first'. We can't simply use 'second' // as the point of insertion, because when 'first' is the last node of closed path, -- cgit v1.2.3