[Gnash-commit] gnash ChangeLog backend/render_handler.h libgeo...

[Bastiaan Jacques]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Bastiaan Jacques <bjacques>     07/11/20 17:17:10

Modified files:
        .              : ChangeLog 
        backend        : render_handler.h 
        libgeometry    : Point2d.h 

Log message:
                * backend/render_handler.h: Document masks.
                * libgeometry/Point2d.h: Define equality operators as clas 
members.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4901&r2=1.4902
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/render_handler.h?cvsroot=gnash&r1=1.50&r2=1.51
http://cvs.savannah.gnu.org/viewcvs/gnash/libgeometry/Point2d.h?cvsroot=gnash&r1=1.2&r2=1.3

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4901
retrieving revision 1.4902
diff -u -b -r1.4901 -r1.4902
--- ChangeLog   20 Nov 2007 16:31:58 -0000      1.4901
+++ ChangeLog   20 Nov 2007 17:17:10 -0000      1.4902
@@ -1,5 +1,10 @@
 2007-11-20 Bastiaan Jacques <address@hidden>
 
+       * backend/render_handler.h: Document masks.
+       * libgeometry/Point2d.h: Define equality operators as clas members.
+
+2007-11-20 Bastiaan Jacques <address@hidden>
+
        * server/vm/ASHandlers.cpp: Fix typo.
 
 2007-11-20 Chad Musick <address@hidden>

Index: backend/render_handler.h
===================================================================
RCS file: /sources/gnash/gnash/backend/render_handler.h,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -b -r1.50 -r1.51
--- backend/render_handler.h    10 Nov 2007 11:51:41 -0000      1.50
+++ backend/render_handler.h    20 Nov 2007 17:17:10 -0000      1.51
@@ -18,7 +18,7 @@
 // 
 //
 
-/* $Id: render_handler.h,v 1.50 2007/11/10 11:51:41 strk Exp $ */
+/* $Id: render_handler.h,v 1.51 2007/11/20 17:17:10 bjacques Exp $ */
 
 #ifndef RENDER_HANDLER_H
 #define RENDER_HANDLER_H
@@ -405,9 +405,23 @@
     
   virtual void  set_antialiased(bool enable) = 0;
     
+  ///@{ Masks
+  ///
+  /// Masks are defined by drawing calls enclosed by begin_submit_mask()
+  /// and end_submit_mask(). Between these two calls, no drawing is to
+  /// occur. The shapes rendered between the two calls define the
+  /// visible region of the mask. Graphics that are irrelevant in the
+  /// context of a mask (lines and fill styles, for example) should be
+  /// ignored. After use, disable_mask() is called to remove the mask.
+  ///
+  /// Masks may be nested. That is, end_submit_mask() may be followed
+  /// by a call to begin_submit_mask(). The resulting mask shall be an
+  /// intersection of the previously created mask. disable_mask() shall
+  /// result in the disabling or destruction of the last created mask.
   virtual void begin_submit_mask() = 0;
   virtual void end_submit_mask() = 0;
   virtual void disable_mask() = 0;
+  ///@}
   
   /// \brief
   /// Draws the given character definition with the stateful properties

Index: libgeometry/Point2d.h
===================================================================
RCS file: /sources/gnash/gnash/libgeometry/Point2d.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- libgeometry/Point2d.h       10 Nov 2007 11:51:42 -0000      1.2
+++ libgeometry/Point2d.h       20 Nov 2007 17:17:10 -0000      1.3
@@ -21,7 +21,7 @@
 //
 
 
-/* $Id: Point2d.h,v 1.2 2007/11/10 11:51:42 strk Exp $ */
+/* $Id: Point2d.h,v 1.3 2007/11/20 17:17:10 bjacques Exp $ */
 
 #ifndef GNASH_POINT2DH
 #define GNASH_POINT2DH
@@ -141,6 +141,16 @@
        {
                return sqrtf(squareDistance(p));
        }
+
+       bool operator== (const Point2d<T>& p) const
+       {
+               return x == p.x && y == p.y;
+       }
+
+       bool operator!=(const Point2d<T>& p) const
+       {
+               return ! (*this == p);
+       }
 };
 
 /// Output operator
@@ -150,19 +160,6 @@
        return os << "Point2d(" << p.x << "," << p.y << ")";
 }
 
-/// Equality operator
-template <typename T> inline bool
-operator== (const Point2d<T>& p1, const Point2d<T>& p2)
-{
-       return p1.x == p2.x && p1.y == p2.y;
-}
-
-/// Inequality operator
-template <typename T> inline bool
-operator!= (const Point2d<T>& p1, const Point2d<T>& p2)
-{
-       return ! ( p1 == p2 );
-}
 
 
 } // namespace gnash::geometry