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

[Udo Giacomozzi]

CVSROOT:        /cvsroot/gnash
Module name:    gnash
Changes by:     Udo Giacomozzi <udog>   07/03/01 11:06:32

Modified files:
        .              : ChangeLog 
        backend        : render_handler.h 
        libgeometry    : snappingrange.h 
        server         : gnash.h types.cpp sprite_instance.cpp 

Log message:
        compiler warning fixes; is_invisible(); check is_invisible() in sprites

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2507&r2=1.2508
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/render_handler.h?cvsroot=gnash&r1=1.29&r2=1.30
http://cvs.savannah.gnu.org/viewcvs/gnash/libgeometry/snappingrange.h?cvsroot=gnash&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/gnash/server/gnash.h?cvsroot=gnash&r1=1.87&r2=1.88
http://cvs.savannah.gnu.org/viewcvs/gnash/server/types.cpp?cvsroot=gnash&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.cpp?cvsroot=gnash&r1=1.183&r2=1.184

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/gnash/gnash/ChangeLog,v
retrieving revision 1.2507
retrieving revision 1.2508
diff -u -b -r1.2507 -r1.2508
--- ChangeLog   1 Mar 2007 10:05:51 -0000       1.2507
+++ ChangeLog   1 Mar 2007 11:06:32 -0000       1.2508
@@ -8,6 +8,10 @@
        * server/video_stream_instance.cpp: simplify add_invalidated_bounds()
        * libgeometry/snappingrange.h: Clarify comment; use initialization list
          in constructor; some minimal changes  
+       * backend/render_handler.h, libgeometry/snappingrange.h: fixed some 
compiler 
+         warnings
+       * server/gnash.h, server/types.cpp: introducing cxform::is_invisible()
+       * server/sprite_instance.cpp: treat cxform.alpha==0 like !m_visible     
                
        
 2007-03-01 Zou Lunkai <address@hidden>
 

Index: backend/render_handler.h
===================================================================
RCS file: /cvsroot/gnash/gnash/backend/render_handler.h,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- backend/render_handler.h    28 Feb 2007 17:25:25 -0000      1.29
+++ backend/render_handler.h    1 Mar 2007 11:06:32 -0000       1.30
@@ -17,7 +17,7 @@
 // 
 //
 
-/* $Id: render_handler.h,v 1.29 2007/02/28 17:25:25 udog Exp $ */
+/* $Id: render_handler.h,v 1.30 2007/03/01 11:06:32 udog Exp $ */
 
 #ifndef RENDER_HANDLER_H
 #define RENDER_HANDLER_H
@@ -414,7 +414,7 @@
   }
   
   virtual bool bounds_in_clipping_area(const InvalidatedRanges& ranges) {
-       for (int rno=0; rno<ranges.size(); rno++) 
+       for (unsigned int rno=0; rno<ranges.size(); rno++) 
                if (bounds_in_clipping_area(ranges.getRange(rno)))
                        return true;
                        

Index: libgeometry/snappingrange.h
===================================================================
RCS file: /cvsroot/gnash/gnash/libgeometry/snappingrange.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- libgeometry/snappingrange.h 1 Mar 2007 09:38:18 -0000       1.6
+++ libgeometry/snappingrange.h 1 Mar 2007 11:06:32 -0000       1.7
@@ -15,7 +15,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 // 
-// $Id: snappingrange.h,v 1.6 2007/03/01 09:38:18 udog Exp $
+// $Id: snappingrange.h,v 1.7 2007/03/01 11:06:32 udog Exp $
 
 #ifndef GNASH_SNAPPINGRANGE_H
 #define GNASH_SNAPPINGRANGE_H
@@ -109,7 +109,7 @@
                
                        // multi range mode
                
-                       for (int rno=0; rno<_ranges.size(); rno++) {
+                       for (unsigned int rno=0; rno<_ranges.size(); rno++) {
                                if (snaptest(_ranges[rno], range)) {
                                        _ranges[rno].expandTo(range);
                                        return;
@@ -126,7 +126,7 @@
        
        /// combines two snapping ranges
        void add(SnappingRanges2d<T> other_ranges) {
-               for (int rno=0; rno<other_ranges.size(); rno++)
+               for (unsigned int rno=0; rno<other_ranges.size(); rno++)
                        add(other_ranges.getRange(rno));
        }
        
@@ -237,8 +237,7 @@
        }
        
        /// Returns the range at the specified index
-       RangeType getRange(int index) const {
-               assert(index>=0);
+       RangeType getRange(unsigned int index) const {
                assert(index<size());
                
                return _ranges[index];

Index: server/gnash.h
===================================================================
RCS file: /cvsroot/gnash/gnash/server/gnash.h,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -b -r1.87 -r1.88
--- server/gnash.h      27 Feb 2007 09:54:49 -0000      1.87
+++ server/gnash.h      1 Mar 2007 11:06:32 -0000       1.88
@@ -17,7 +17,7 @@
 // 
 //
 
-/* $Id: gnash.h,v 1.87 2007/02/27 09:54:49 strk Exp $ */
+/* $Id: gnash.h,v 1.88 2007/03/01 11:06:32 udog Exp $ */
 
 /// \mainpage
 ///
@@ -468,6 +468,9 @@
     /// Returns true when the cxform equals identity (no transform)
     bool is_identity() const;
     
+    /// Returns true when the cxform leads to alpha == 0
+    bool is_invisible() const;
+    
     /// The identity color transform (no transform)
     static cxform      identity;
 };

Index: server/types.cpp
===================================================================
RCS file: /cvsroot/gnash/gnash/server/types.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- server/types.cpp    7 Feb 2007 13:31:26 -0000       1.19
+++ server/types.cpp    1 Mar 2007 11:06:32 -0000       1.20
@@ -185,6 +185,11 @@
          return true;
   }
 
+       bool    cxform::is_invisible() const
+       // Returns true when the cxform leads to alpha == 0
+       {
+               return (255.0 * m_[3][0] + m_[3][1]) <= 0.0;    
+  }
 
        //
        // rgba

Index: server/sprite_instance.cpp
===================================================================
RCS file: /cvsroot/gnash/gnash/server/sprite_instance.cpp,v
retrieving revision 1.183
retrieving revision 1.184
diff -u -b -r1.183 -r1.184
--- server/sprite_instance.cpp  1 Mar 2007 08:59:56 -0000       1.183
+++ server/sprite_instance.cpp  1 Mar 2007 11:06:32 -0000       1.184
@@ -3489,14 +3489,12 @@
 {
 
        // nothing to do if this sprite is not visible
-       if (!m_visible)
+       if (!m_visible || get_cxform().is_invisible() )
        {
     ranges.add(m_old_invalidated_ranges); // (in case we just hided)
                return;
        }
 
-       // TODO: check if alpha=0 (return if so)
-       // nothing to do if this sprite's bounds are
        // not invalidated (unless *forced*)
        if ( ! m_invalidated && ! m_child_invalidated && ! force )
        {