Update to trunk/Fix GTK3 build errors

(bzr r13090.1.26)

6 files changed, 57 insertions, 62 deletions

diff --git a/src/extension/internal/emf-print.cpp b/src/extension/internal/emf-print.cpp
index 9cc662a27..4bb892821 100644
--- a/src/extension/internal/emf-print.cpp
+++ b/src/extension/internal/emf-print.cpp
@@ -1562,7 +1562,7 @@ unsigned int PrintEmf::image(
     unsigned int h,      /** height of bitmap */
     unsigned int rs,     /** row stride (normally w*4) */
     Geom::Affine const &tf_rect,  /** affine transform only used for defining location and size of rect, for all other tranforms, use the one from m_tr_stack */
-    SPStyle const *style)  /** provides indirect link to image object */
+    SPStyle const * /*style*/)  /** provides indirect link to image object */
 {
     double x1, y1, dw, dh;
     char *rec = NULL;
diff --git a/src/extension/internal/grid.cpp b/src/extension/internal/grid.cpp
index c120df719..0059bbec2 100644
--- a/src/extension/internal/grid.cpp
+++ b/src/extension/internal/grid.cpp
@@ -59,31 +59,31 @@ Grid::load (Inkscape::Extension::Extension */*module*/)
 namespace {
 
 Glib::ustring build_lines(Geom::Rect bounding_area,
-                          float offset[], float spacing[])
+                          Geom::Point const &offset, Geom::Point const &spacing)
 {
     Geom::Point point_offset(0.0, 0.0);
 
     SVG::PathString path_data;
 
-    for ( int axis = 0 ; axis < 2 ; ++axis ) {
+    for ( int axis = Geom::X ; axis <= Geom::Y ; ++axis ) {
         point_offset[axis] = offset[axis];
 
         for (Geom::Point start_point = bounding_area.min();
-                start_point[axis] + offset[axis] <= (bounding_area.max())[axis];
-                start_point[axis] += spacing[axis]) {
+             start_point[axis] + offset[axis] <= (bounding_area.max())[axis];
+             start_point[axis] += spacing[axis]) {
             Geom::Point end_point = start_point;
             end_point[1-axis] = (bounding_area.max())[1-axis];
 
             path_data.moveTo(start_point + point_offset)
-                     .lineTo(end_point + point_offset);
+                .lineTo(end_point + point_offset);
         }
     }
-        // std::cout << "Path data:" << path_data.c_str() << std::endl;
-        return path_data;
-    }
-
+    // std::cout << "Path data:" << path_data.c_str() << std::endl;
+    return path_data;
 }
 
+} // namespace
+
 /**
     \brief  This actually draws the grid.
     \param  module   The effect that was called (unused)
@@ -115,16 +115,15 @@ Grid::effect (Inkscape::Extension::Effect *module, Inkscape::UI::View::View *doc
 
     gdouble scale = Inkscape::Util::Quantity::convert(1, "px", (document->doc())->getDefaultUnit());
     bounding_area *= Geom::Scale(scale);
-    float spacings[2] = { scale*module->get_param_float("xspacing"),
-                          scale*module->get_param_float("yspacing") };
-    float line_width = scale*module->get_param_float("lineWidth");
-    float offsets[2] = { scale*module->get_param_float("xoffset"),
-                         scale*module->get_param_float("yoffset") };
+    Geom::Point spacings( scale * module->get_param_float("xspacing"),
+                          scale * module->get_param_float("yspacing") );
+    gdouble line_width = scale * module->get_param_float("lineWidth");
+    Geom::Point offsets( scale * module->get_param_float("xoffset"),
+                         scale * module->get_param_float("yoffset") );
 
     Glib::ustring path_data("");
 
-    path_data = build_lines(bounding_area,
-                                 offsets, spacings);
+    path_data = build_lines(bounding_area, offsets, spacings);
     Inkscape::XML::Document * xml_doc = document->doc()->getReprDoc();
 
     //XML Tree being used directly here while it shouldn't be.
@@ -144,9 +143,7 @@ Grid::effect (Inkscape::Extension::Effect *module, Inkscape::UI::View::View *doc
     path->setAttribute("style", style.c_str());
 
     current_layer->appendChild(path);
-		Inkscape::GC::release(path);
-
-    return;
+    Inkscape::GC::release(path);
 }
 
 /** \brief  A class to make an adjustment that uses Extension params */
diff --git a/src/extension/internal/pdfinput/pdf-parser.cpp b/src/extension/internal/pdfinput/pdf-parser.cpp
index 7edb758fd..30e120d26 100644
--- a/src/extension/internal/pdfinput/pdf-parser.cpp
+++ b/src/extension/internal/pdfinput/pdf-parser.cpp
@@ -718,10 +718,7 @@ void PdfParser::opSetMiterLimit(Object args[], int /*numArgs*/)
 // TODO not good that numArgs is ignored but args[] is used:
 void PdfParser::opSetLineWidth(Object args[], int /*numArgs*/)
 {
-  if (args[0].getNum() > 0.0)
-    state->setLineWidth(args[0].getNum());
-  else
-    state->setLineWidth(1.0);      // default
+  state->setLineWidth(args[0].getNum());
   builder->updateStyle(state);
 }
 
diff --git a/src/extension/internal/pdfinput/svg-builder.cpp b/src/extension/internal/pdfinput/svg-builder.cpp
index 20cd74cdb..71e6dc6ae 100644
--- a/src/extension/internal/pdfinput/svg-builder.cpp
+++ b/src/extension/internal/pdfinput/svg-builder.cpp
@@ -56,9 +56,6 @@ namespace Internal {
 
 #define TRACE(_args) IFTRACE(g_print _args)
 
-static double ttm[6] = {1, 0, 0, 1, 0, 0};	// temporary transform matrix
-static bool ttm_is_set = false;             // flag to forbid setting ttm
-
 /**
  * \struct SvgTransparencyGroup
  * \brief Holds information about a PDF transparency group
@@ -94,6 +91,9 @@ SvgBuilder::SvgBuilder(SPDocument *document, gchar *docname, XRef *xref)
     _preferences = _xml_doc->createElement("svgbuilder:prefs");
     _preferences->setAttribute("embedImages", "1");
     _preferences->setAttribute("localFonts", "1");
+
+    _ttm[0] = 1; _ttm[1] = 0; _ttm[2] = 0; _ttm[3] = 1; _ttm[4] = 0; _ttm[5] = 0;
+    _ttm_is_set = false;
 }
 
 SvgBuilder::SvgBuilder(SvgBuilder *parent, Inkscape::XML::Node *root) {
@@ -216,9 +216,9 @@ Inkscape::XML::Node *SvgBuilder::pushGroup() {
         }
     }
     if (_container->parent()->attribute("inkscape:groupmode") != NULL) {
-        ttm[0] = ttm[3] = 1.0;    // clear ttm if parent is a layer
-        ttm[1] = ttm[2] = ttm[4] = ttm[5] = 0.0;
-        ttm_is_set = false;
+        _ttm[0] = _ttm[3] = 1.0;    // clear ttm if parent is a layer
+        _ttm[1] = _ttm[2] = _ttm[4] = _ttm[5] = 0.0;
+        _ttm_is_set = false;
     }
     return _container;
 }
@@ -298,14 +298,6 @@ static gchar *svgInterpretPath(GfxPath *path) {
  * Uses the given SPCSSAttr for storing the style properties
  */
 void SvgBuilder::_setStrokeStyle(SPCSSAttr *css, GfxState *state) {
-
-    // Check line width
-    if ( state->getLineWidth() <= 0.0 ) {
-        // Ignore stroke
-        sp_repr_css_set_property(css, "stroke", "none");
-        return;
-    }
-
     // Stroke color/pattern
     if ( state->getStrokeColorSpace()->getMode() == csPattern ) {
         gchar *urltext = _createPattern(state->getStrokePattern(), state, true);
@@ -326,7 +318,14 @@ void SvgBuilder::_setStrokeStyle(SPCSSAttr *css, GfxState *state) {
 
     // Line width
     Inkscape::CSSOStringStream os_width;
-    os_width << state->getLineWidth();
+    double lw = state->getLineWidth();
+    if (lw > 0.0) {
+        os_width << lw;
+    } else {
+        // emit a stroke which is 1px in toplevel user units
+        double pxw = Inkscape::Util::Quantity::convert(1.0, "pt", "px");
+        os_width << 1.0 / state->transformWidth(pxw);
+    }
     sp_repr_css_set_property(css, "stroke-width", os_width.str().c_str());
 
     // Line cap
@@ -570,14 +569,14 @@ bool SvgBuilder::getTransform(double *transform) {
 void SvgBuilder::setTransform(double c0, double c1, double c2, double c3,
                               double c4, double c5) {
     // do not remember the group which is a layer
-    if ((_container->attribute("inkscape:groupmode") == NULL) && !ttm_is_set) {
-        ttm[0] = c0;
-        ttm[1] = c1;
-        ttm[2] = c2;
-        ttm[3] = c3;
-        ttm[4] = c4;
-        ttm[5] = c5;
-        ttm_is_set = true;
+    if ((_container->attribute("inkscape:groupmode") == NULL) && !_ttm_is_set) {
+        _ttm[0] = c0;
+        _ttm[1] = c1;
+        _ttm[2] = c2;
+        _ttm[3] = c3;
+        _ttm[4] = c4;
+        _ttm[5] = c5;
+        _ttm_is_set = true;
     }
 
     // Avoid transforming a group with an already set clip-path
@@ -633,15 +632,15 @@ gchar *SvgBuilder::_createPattern(GfxPattern *pattern, GfxState *state, bool is_
             // construct a (pattern space) -> (current space) transform matrix
 
             ptm = shading_pattern->getMatrix();
-            det = ttm[0] * ttm[3] - ttm[1] * ttm[2];
+            det = _ttm[0] * _ttm[3] - _ttm[1] * _ttm[2];
             if (det) {
                 double ittm[6];	// invert ttm
-                ittm[0] =  ttm[3] / det;
-                ittm[1] = -ttm[1] / det;
-                ittm[2] = -ttm[2] / det;
-                ittm[3] =  ttm[0] / det;
-                ittm[4] = (ttm[2] * ttm[5] - ttm[3] * ttm[4]) / det;
-                ittm[5] = (ttm[1] * ttm[4] - ttm[0] * ttm[5]) / det;
+                ittm[0] =  _ttm[3] / det;
+                ittm[1] = -_ttm[1] / det;
+                ittm[2] = -_ttm[2] / det;
+                ittm[3] =  _ttm[0] / det;
+                ittm[4] = (_ttm[2] * _ttm[5] - _ttm[3] * _ttm[4]) / det;
+                ittm[5] = (_ttm[1] * _ttm[4] - _ttm[0] * _ttm[5]) / det;
                 m[0] = ptm[0] * ittm[0] + ptm[1] * ittm[2];
                 m[1] = ptm[0] * ittm[1] + ptm[1] * ittm[3];
                 m[2] = ptm[2] * ittm[0] + ptm[3] * ittm[2];
@@ -676,15 +675,15 @@ gchar *SvgBuilder::_createTilingPattern(GfxTilingPattern *tiling_pattern,
     double *p2u = tiling_pattern->getMatrix();
     double m[6] = {1, 0, 0, 1, 0, 0};
     double det;
-    det = ttm[0] * ttm[3] - ttm[1] * ttm[2];    // see LP Bug 1168908
+    det = _ttm[0] * _ttm[3] - _ttm[1] * _ttm[2];    // see LP Bug 1168908
     if (det) {
         double ittm[6];	// invert ttm
-        ittm[0] =  ttm[3] / det;
-        ittm[1] = -ttm[1] / det;
-        ittm[2] = -ttm[2] / det;
-        ittm[3] =  ttm[0] / det;
-        ittm[4] = (ttm[2] * ttm[5] - ttm[3] * ttm[4]) / det;
-        ittm[5] = (ttm[1] * ttm[4] - ttm[0] * ttm[5]) / det;
+        ittm[0] =  _ttm[3] / det;
+        ittm[1] = -_ttm[1] / det;
+        ittm[2] = -_ttm[2] / det;
+        ittm[3] =  _ttm[0] / det;
+        ittm[4] = (_ttm[2] * _ttm[5] - _ttm[3] * _ttm[4]) / det;
+        ittm[5] = (_ttm[1] * _ttm[4] - _ttm[0] * _ttm[5]) / det;
         m[0] = p2u[0] * ittm[0] + p2u[1] * ittm[2];
         m[1] = p2u[0] * ittm[1] + p2u[1] * ittm[3];
         m[2] = p2u[2] * ittm[0] + p2u[3] * ittm[2];
diff --git a/src/extension/internal/pdfinput/svg-builder.h b/src/extension/internal/pdfinput/svg-builder.h
index 610822959..f1ce02cf0 100644
--- a/src/extension/internal/pdfinput/svg-builder.h
+++ b/src/extension/internal/pdfinput/svg-builder.h
@@ -223,6 +223,8 @@ private:
     Inkscape::XML::Node *_preferences;  // Preferences container node
     double _width;       // Document size in px
     double _height;       // Document size in px
+    double _ttm[6]; ///< temporary transform matrix
+    bool _ttm_is_set;
 };
 
 
diff --git a/src/extension/internal/wmf-print.cpp b/src/extension/internal/wmf-print.cpp
index 232891c9c..5a552ad83 100644
--- a/src/extension/internal/wmf-print.cpp
+++ b/src/extension/internal/wmf-print.cpp
@@ -1103,7 +1103,7 @@ unsigned int PrintWmf::image(
     unsigned int h,      /** height of bitmap */
     unsigned int rs,     /** row stride (normally w*4) */
     Geom::Affine const &tf_rect,  /** affine transform only used for defining location and size of rect, for all other tranforms, use the one from m_tr_stack */
-    SPStyle const *style)  /** provides indirect link to image object */
+    SPStyle const * /*style*/)  /** provides indirect link to image object */
 {
     double x1, y1, dw, dh;
     char *rec = NULL;