[Gnash-commit] gnash ChangeLog libgeometry/Range2d.h server/re...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  06/12/06 08:46:50

Modified files:
        .              : ChangeLog 
        libgeometry    : Range2d.h 
        server         : rect.h 

Log message:
                * libgeometry/Range2d.h (Intersect): removed spurious code.
                * server/rect.h: added getRange() method.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1862&r2=1.1863
http://cvs.savannah.gnu.org/viewcvs/gnash/libgeometry/Range2d.h?cvsroot=gnash&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/gnash/server/rect.h?cvsroot=gnash&r1=1.14&r2=1.15

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1862
retrieving revision 1.1863
diff -u -b -r1.1862 -r1.1863
--- ChangeLog   5 Dec 2006 23:05:00 -0000       1.1862
+++ ChangeLog   6 Dec 2006 08:46:50 -0000       1.1863
@@ -1,3 +1,8 @@
+2006-12-06 Sandro Santilli <address@hidden>
+
+       * libgeometry/Range2d.h (Intersect): removed spurious code.
+       * server/rect.h: added getRange() method.
+
 2006-12-05 Sandro Santilli <address@hidden>
 
        * server/rect.cpp (expand_to_rect): handled world rects.

Index: libgeometry/Range2d.h
===================================================================
RCS file: /sources/gnash/gnash/libgeometry/Range2d.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- libgeometry/Range2d.h       3 Dec 2006 21:43:11 -0000       1.3
+++ libgeometry/Range2d.h       6 Dec 2006 08:46:50 -0000       1.4
@@ -19,7 +19,7 @@
 //
 
 
-/* $Id: Range2d.h,v 1.3 2006/12/03 21:43:11 strk Exp $ */
+/* $Id: Range2d.h,v 1.4 2006/12/06 08:46:50 strk Exp $ */
 
 #ifndef GNASH_RANGE2D_H
 #define GNASH_RANGE2D_H
@@ -616,7 +616,7 @@
 template <typename T> inline bool
 Intersect(const Range2d<T>& r1, const Range2d<T>& r2)
 {
-       return r1.intersects(r2);Range2d<T> ret = r1;
+       return r1.intersects(r2);
 }
 
 /// Return a rectangle being the union of the two rectangles

Index: server/rect.h
===================================================================
RCS file: /sources/gnash/gnash/server/rect.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- server/rect.h       5 Dec 2006 17:13:22 -0000       1.14
+++ server/rect.h       6 Dec 2006 08:46:50 -0000       1.15
@@ -17,7 +17,7 @@
 // 
 //
 
-/* $Id: rect.h,v 1.14 2006/12/05 17:13:22 strk Exp $ */
+/* $Id: rect.h,v 1.15 2006/12/06 08:46:50 strk Exp $ */
 
 #ifndef GNASH_RECT_H
 #define GNASH_RECT_H
@@ -242,6 +242,15 @@
        DSOEXPORT void  expand_to_rect(const rect& r);
 
        void    set_lerp(const rect& a, const rect& b, float t);
+
+
+       /// \brief
+       /// Returns a const reference to the underlying
+       /// Range2d object.
+       const geometry::Range2d<float> & getRange() const
+       {
+               return _range;
+       }
 };
 
 inline std::ostream&