[Gnash-commit] gnash ChangeLog libgeometry/snappingrange.h

[Udo Giacomozzi]

CVSROOT:        /cvsroot/gnash
Module name:    gnash
Changes by:     Udo Giacomozzi <udog>   07/11/06 16:40:10

Modified files:
        .              : ChangeLog 
        libgeometry    : snappingrange.h 

Log message:
        make copy constructor work again by adding getter methods for private 
members (makes testcase work again)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4784&r2=1.4785
http://cvs.savannah.gnu.org/viewcvs/gnash/libgeometry/snappingrange.h?cvsroot=gnash&r1=1.29&r2=1.30

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/gnash/gnash/ChangeLog,v
retrieving revision 1.4784
retrieving revision 1.4785
diff -u -b -r1.4784 -r1.4785
--- ChangeLog   6 Nov 2007 16:04:07 -0000       1.4784
+++ ChangeLog   6 Nov 2007 16:40:09 -0000       1.4785
@@ -1,7 +1,8 @@
 2007-11-06 Udo Giacomozzi <address@hidden>
 
        * libgeometry/snappingrange.h: add range count limiting functionality
-         and limit to 50 ranges by default     
+         and limit to 50 ranges by default; make copy constructor work again
+         by adding getter methods for private members  
 
 2007-11-06 Udo Giacomozzi <address@hidden>
 

Index: libgeometry/snappingrange.h
===================================================================
RCS file: /cvsroot/gnash/gnash/libgeometry/snappingrange.h,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- libgeometry/snappingrange.h 6 Nov 2007 16:06:59 -0000       1.29
+++ libgeometry/snappingrange.h 6 Nov 2007 16:40:10 -0000       1.30
@@ -16,7 +16,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 // 
-// $Id: snappingrange.h,v 1.29 2007/11/06 16:06:59 udog Exp $
+// $Id: snappingrange.h,v 1.30 2007/11/06 16:40:10 udog Exp $
 
 #ifndef GNASH_SNAPPINGRANGE_H
 #define GNASH_SNAPPINGRANGE_H
@@ -93,9 +93,9 @@
   template <typename U>
   SnappingRanges2d(const SnappingRanges2d<U>& from)
     :
-    snap_factor(T(from.snap_factor)), // does it make sense ?
-    single_mode(from.single_mode),
-    ranges_limit(from.ranges_limit),
+    snap_factor(T(from.getSnapFactor())), // does it make sense ?
+    single_mode(from.getSingleMode()),
+    ranges_limit(from.getRangeCountLimit()),
     _combine_counter(0)
   {
     if ( from.isWorld() ) {
@@ -125,17 +125,29 @@
     snap_factor = factor;
   }
   
+  float getSnapFactor() const {
+    return snap_factor;
+  }
+  
   /// if mode==true, then the snapping ranges will act like a normal Range2d
   void setSingleMode(bool mode) {
     single_mode = mode;
   }
   
+  bool getSingleMode() const {
+    return single_mode;
+  }  
+  
   /// Sets the maximum number of ranges allowed (to avoid lots of small
   /// ranges)
   void setRangeCountLimit(unsigned limit) {
     ranges_limit = limit;
   }
   
+  unsigned getRangeCountLimit() const {
+    return ranges_limit;
+  }
+  
   /// Copy the snapping settings from another ranges list, without
   /// copying the ranges itself
   void inheritConfig(const SnappingRanges2d<T>& from) {
@@ -605,6 +617,7 @@
   // The current Ranges list
   RangeList _ranges;
   
+public:   
   /// snapping factor - see setSnapFactor() 
   float snap_factor;