From 677385b07c489ace6b7057a95a3260a341edfdff Mon Sep 17 00:00:00 2001 From: "Johan B. C. Engelen" Date: Mon, 14 Apr 2014 22:38:32 +0200 Subject: patch by Gellule, fixes wrong parsing of style, work-around for bug in libc++ Fixed bugs: - https://launchpad.net/bugs/1300271 (bzr r13285) --- src/xml/repr-css.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/xml/repr-css.cpp b/src/xml/repr-css.cpp index 24e2db9e1..32a1e7f5d 100644 --- a/src/xml/repr-css.cpp +++ b/src/xml/repr-css.cpp @@ -382,7 +382,10 @@ static void sp_repr_css_merge_from_decl(SPCSSAttr *css, CRDeclaration const *con std::string characters; std::string temp; bool number_valid = !(ss >> number).fail(); - if( !number_valid ) ss.clear(); + if (!number_valid) { + ss.clear(); + ss.seekg(0); // work-around for a bug in libc++ (see lp:1300271) + } while( !(ss >> temp).eof() ) { characters += temp; characters += " "; -- cgit v1.2.3 From 646534345d309233570969f98fcf9495c19d45ae Mon Sep 17 00:00:00 2001 From: "Johan B. C. Engelen" Date: Mon, 14 Apr 2014 22:48:12 +0200 Subject: Improve calculation precision of stroke-to-path, for very large user units that make the stroke width a very small number. Fixed bugs: - https://launchpad.net/bugs/1244861 (bzr r13286) --- src/splivarot.cpp | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'src') diff --git a/src/splivarot.cpp b/src/splivarot.cpp index 6aec42c5b..40f3f174a 100644 --- a/src/splivarot.cpp +++ b/src/splivarot.cpp @@ -960,16 +960,17 @@ Geom::PathVector* item_outline(SPItem const *item, bool bbox_only) Geom::Affine const transform(item->transform); float const scale = transform.descrim(); - float o_width, o_miter; + float o_width = i_style->stroke_width.computed; + if (o_width < Geom::EPSILON) { + // This may result in rounding errors for very small stroke widths (happens e.g. when user unit is large). + // See bug lp:1244861 + o_width = Geom::EPSILON; + } + float o_miter = i_style->stroke_miterlimit.value * o_width; + JoinType o_join; ButtType o_butt; { - o_width = i_style->stroke_width.computed; - if (o_width < 0.01) { - o_width = 0.01; - } - o_miter = i_style->stroke_miterlimit.value * o_width; - switch (i_style->stroke_linejoin.computed) { case SP_STROKE_LINEJOIN_MITER: o_join = join_pointy; -- cgit v1.2.3 From 204b9726e63765daac179c9c7972e08c5b62a1c1 Mon Sep 17 00:00:00 2001 From: "Johan B. C. Engelen" Date: Mon, 14 Apr 2014 22:55:29 +0200 Subject: remove debug messages in desktop.cpp (bzr r13287) --- src/desktop.cpp | 3 --- 1 file changed, 3 deletions(-) (limited to 'src') diff --git a/src/desktop.cpp b/src/desktop.cpp index 22c00d4f1..b61f6867f 100644 --- a/src/desktop.cpp +++ b/src/desktop.cpp @@ -1699,7 +1699,6 @@ _layer_hierarchy_changed(SPObject */*top*/, SPObject *bottom, /// Called when document is starting to be rebuilt. static void _reconstruction_start(SPDesktop * desktop) { - g_debug("Desktop, starting reconstruction\n"); desktop->_reconstruction_old_layer_id = desktop->currentLayer()->getId() ? desktop->currentLayer()->getId() : ""; desktop->layers->reset(); @@ -1710,8 +1709,6 @@ static void _reconstruction_start(SPDesktop * desktop) } */ desktop->selection->clear(); - - g_debug("Desktop, starting reconstruction end\n"); } /// Called when document rebuild is finished. -- cgit v1.2.3 From c95ccf684a7de367bd7024acf2610a15d20efe75 Mon Sep 17 00:00:00 2001 From: Martin Owens Date: Wed, 16 Apr 2014 08:50:06 -0400 Subject: Commit suv's patch for quartz default window size. See bug #1302627 Fixed bugs: - https://launchpad.net/bugs/1302627 (bzr r13289) --- src/preferences-skeleton.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/preferences-skeleton.h b/src/preferences-skeleton.h index 96629f22d..734e8a582 100644 --- a/src/preferences-skeleton.h +++ b/src/preferences-skeleton.h @@ -293,7 +293,9 @@ static char const preferences_skeleton[] = #ifdef WIN32 // FIXME: Temporary Win32 special code to enable transient dialogs " \n" #endif -" \n" +#if !defined(GDK_WINDOWING_QUARTZ) // No maximise for Quartz, see lp:1302627 + " \n" +#endif " \n" " \n" " \n" -- cgit v1.2.3 From 7a86aa06d93a5cdec9cc55b514bd7ac7079fe50e Mon Sep 17 00:00:00 2001 From: Alex Valavanis Date: Wed, 16 Apr 2014 20:35:41 +0100 Subject: workaround build failure on Ubuntu 14.04 with dbus ext and clang (bzr r13290) --- src/display/sp-canvas.cpp | 2 ++ src/extension/dbus/Makefile_insert | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/display/sp-canvas.cpp b/src/display/sp-canvas.cpp index 6d903867b..3dc4a7504 100644 --- a/src/display/sp-canvas.cpp +++ b/src/display/sp-canvas.cpp @@ -2153,6 +2153,8 @@ gboolean SPCanvasImpl::handleDraw(GtkWidget *widget, cairo_t *cr) { canvas->requestRedraw(r.left(), r.top(), r.right(), r.bottom()); } + cairo_rectangle_list_destroy(rects); + return FALSE; } #else diff --git a/src/extension/dbus/Makefile_insert b/src/extension/dbus/Makefile_insert index 7d851715e..192651d87 100644 --- a/src/extension/dbus/Makefile_insert +++ b/src/extension/dbus/Makefile_insert @@ -78,7 +78,7 @@ libinkdbus_la_CFLAGS = \ $(DBUS_CFLAGS) \ $(INKSCAPE_CFLAGS) \ -I$(builddir)/extension/dbus \ - -Wall -Werror + -Wall libinkdbus_la_LIBADD = \ $(DBUS_LIBS) \ -- cgit v1.2.3