From de48d617201340b760a8a3466570215aaac9e82f Mon Sep 17 00:00:00 2001
From: Fernando Cacciola <fernando.cacciola@geometryfactory.com>
Date: Mon, 3 May 2010 18:25:25 +0000
Subject: [PATCH] Weighted straight skeleton API update

---
 .../demo/Straight_skeleton_2/straight_skeleton_2.cpp     | 2 +-
 .../Straight_skeleton_2/Create_offset_polygons_2.cpp     | 2 +-
 .../include/CGAL/Straight_skeleton_builder_2.h           | 9 ++++-----
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/Straight_skeleton_2/demo/Straight_skeleton_2/straight_skeleton_2.cpp b/Straight_skeleton_2/demo/Straight_skeleton_2/straight_skeleton_2.cpp
index 02dd70e4aa6..0043a8f9a2d 100644
--- a/Straight_skeleton_2/demo/Straight_skeleton_2/straight_skeleton_2.cpp
+++ b/Straight_skeleton_2/demo/Straight_skeleton_2/straight_skeleton_2.cpp
@@ -36,7 +36,7 @@
 #include <qmessagebox.h>
 #include <qpopupmenu.h>
 #include <qmenubar.h>
-#include <qtoolbutton.h>
+#include <qtoolbutton.h>  
 #include <qtoolbar.h>
 #include <qfiledialog.h>
 #include <qtimer.h>
diff --git a/Straight_skeleton_2/examples/Straight_skeleton_2/Create_offset_polygons_2.cpp b/Straight_skeleton_2/examples/Straight_skeleton_2/Create_offset_polygons_2.cpp
index ad528ffd859..30f251c658f 100644
--- a/Straight_skeleton_2/examples/Straight_skeleton_2/Create_offset_polygons_2.cpp
+++ b/Straight_skeleton_2/examples/Straight_skeleton_2/Create_offset_polygons_2.cpp
@@ -6,7 +6,7 @@
 #include<CGAL/Polygon_2.h>
 #include<CGAL/create_offset_polygons_2.h>
 
-#include "print.h"
+#include "print.h" 
 
 typedef CGAL::Exact_predicates_inexact_constructions_kernel K ;
 
diff --git a/Straight_skeleton_2/include/CGAL/Straight_skeleton_builder_2.h b/Straight_skeleton_2/include/CGAL/Straight_skeleton_builder_2.h
index 2ee1bc9ee44..deefd6e656c 100644
--- a/Straight_skeleton_2/include/CGAL/Straight_skeleton_builder_2.h
+++ b/Straight_skeleton_2/include/CGAL/Straight_skeleton_builder_2.h
@@ -1114,10 +1114,10 @@ public:
     return *this ;
   }
   
-  template<class InputPointIterator, class NT>
+  template<class InputPointIterator>
   Straight_skeleton_builder_2& enter_contour ( InputPointIterator aBegin
                                              , InputPointIterator aEnd
-                                             , NT                 aWeight        = 1.0
+                                             , double             aWeight        = 1.0
                                              , bool               aIsClosed      = true
                                              , bool               aCheckValidity = true 
                                              )
@@ -1125,17 +1125,16 @@ public:
     return enter_contour(aBegin, aEnd, aWeight, aIsClosed, Cartesian_converter<K,K>(), aCheckValidity);
   }                          
   
-  template<class InputPointIterator, class InputWeightIterator, class NT>
+  template<class InputPointIterator, class InputWeightIterator>
   Straight_skeleton_builder_2& enter_contour ( InputPointIterator  aPBegin
                                              , InputPointIterator  aPEnd
                                              , InputWeightIterator aWBegin
                                              , InputWeightIterator aWEnd
-                                             , NT                  aWeight        = 1.0
                                              , bool                aIsClosed      = true
                                              , bool                aCheckValidity = true 
                                              )
   {
-    return enter_contour(aPBegin, aPEnd, aWBegin, aWEnd, aWeight, aIsClosed, Cartesian_converter<K,K>(), aCheckValidity ) ;
+    return enter_contour(aPBegin, aPEnd, aWBegin, aWEnd, aIsClosed, Cartesian_converter<K,K>(), aCheckValidity ) ;
   }                                             
 
 } ;