diff options
| author | Markus Engel <markus.engel@tum.de> | 2013-03-29 23:52:42 +0000 |
|---|---|---|
| committer | Markus Engel <markus.engel@tum.de> | 2013-03-29 23:52:42 +0000 |
| commit | a168040d5a452544328a1e6ad35aaac351f94d44 (patch) | |
| tree | fae1ba829f543a473da281bd5fa6e4deabbf6912 /src/desktop-style.cpp | |
| parent | Removed function pointers from SPObject and subclasses. (diff) | |
| parent | Dutch translation update (diff) | |
| download | inkscape-a168040d5a452544328a1e6ad35aaac351f94d44.tar.gz inkscape-a168040d5a452544328a1e6ad35aaac351f94d44.zip | |
merged from trunk
(bzr r11608.1.56)
Diffstat (limited to 'src/desktop-style.cpp')
| -rw-r--r-- | src/desktop-style.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/desktop-style.cpp b/src/desktop-style.cpp index 74e15e3e2..40132ec58 100644 --- a/src/desktop-style.cpp +++ b/src/desktop-style.cpp @@ -39,6 +39,7 @@ #include "sp-tref.h" #include "sp-tspan.h" #include "xml/repr.h" +#include "xml/sp-css-attr.h" #include "libnrtype/font-style-to-pos.h" #include "sp-path.h" #include "event-context.h" @@ -445,9 +446,9 @@ stroke_average_width (GSList const *objects) static bool vectorsClose( std::vector<double> const &lhs, std::vector<double> const &rhs ) { - static double epsilon = 1e-6; bool isClose = false; if ( lhs.size() == rhs.size() ) { + static double epsilon = 1e-6; isClose = true; for ( size_t i = 0; (i < lhs.size()) && isClose; ++i ) { isClose = fabs(lhs[i] - rhs[i]) < epsilon; @@ -1117,7 +1118,7 @@ objects_query_fontstyle (GSList *objects, SPStyle *style_res) /** * Write to style_res the baseline numbers. */ -int +static int objects_query_baselines (GSList *objects, SPStyle *style_res) { bool different = false; @@ -1273,7 +1274,7 @@ objects_query_fontfamily (GSList *objects, SPStyle *style_res) } } -int +static int objects_query_fontspecification (GSList *objects, SPStyle *style_res) { bool different = false; @@ -1335,7 +1336,7 @@ objects_query_fontspecification (GSList *objects, SPStyle *style_res) } } -int +static int objects_query_blend (GSList *objects, SPStyle *style_res) { const int empty_prev = -2; |