summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2012-10-22 16:17:54 +0000
committerCampbell Barton <ideasman42@gmail.com>2012-10-22 16:17:54 +0000
commit9e010c259cfdbeaacd5d519264e1d6ad82c44363 (patch)
tree514e2c0f4aa2dc1f05e4de72140e7b1512bfdb1c /src
parentBuild. Reverting GTKMM changes in devlibs and build.xml. (diff)
downloadinkscape-9e010c259cfdbeaacd5d519264e1d6ad82c44363.tar.gz
inkscape-9e010c259cfdbeaacd5d519264e1d6ad82c44363.zip
update cmake files & make function static.
(bzr r11821)
Diffstat (limited to 'src')
-rw-r--r--src/live_effects/lpe-powerstroke.cpp2
-rw-r--r--src/ui/CMakeLists.txt2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/live_effects/lpe-powerstroke.cpp b/src/live_effects/lpe-powerstroke.cpp
index 13fea76c5..b042f8d41 100644
--- a/src/live_effects/lpe-powerstroke.cpp
+++ b/src/live_effects/lpe-powerstroke.cpp
@@ -157,7 +157,7 @@ static int circle_circle_intersection(Circle const &circle0, Circle const &circl
* Find circle that touches inside of the curve, with radius matching the curvature, at time value \c t.
* Because this method internally uses unitTangentAt, t should be smaller than 1.0 (see unitTangentAt).
*/
-Circle touching_circle( D2<SBasis> const &curve, double t, double tol=0.01 )
+static Circle touching_circle( D2<SBasis> const &curve, double t, double tol=0.01 )
{
//Piecewise<SBasis> k = curvature(curve, tol);
D2<SBasis> dM=derivative(curve);
diff --git a/src/ui/CMakeLists.txt b/src/ui/CMakeLists.txt
index ec7782302..8fd8eb4e3 100644
--- a/src/ui/CMakeLists.txt
+++ b/src/ui/CMakeLists.txt
@@ -60,6 +60,7 @@ set(ui_SRC
dialog/print-colors-preview-dialog.cpp
dialog/print.cpp
dialog/scriptdialog.cpp
+ dialog/symbols.cpp
dialog/xml-tree.cpp
# dialog/session-player.cpp
dialog/spellcheck.cpp
@@ -174,6 +175,7 @@ set(ui_SRC
dialog/spellcheck.h
dialog/svg-fonts-dialog.h
dialog/swatches.h
+ dialog/symbols.h
dialog/text-edit.h
dialog/tile.h
dialog/tracedialog.h