[Gnash-commit] gnash ChangeLog backend/render_handler_agg_styl... [release_0_7_2]

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Branch:         release_0_7_2
Changes by:     Sandro Santilli <strk>  06/11/06 17:05:36

Modified files:
        .              : ChangeLog 
        backend        : render_handler_agg_style.h 
        server         : styles.cpp styles.h 

Log message:
        (Back port)
                * backend/render_handler_agg_style.h: comment-out
                  add_bitmap with NULL input warning.
                * server/styles.{h,cpp}: warn about bitmap fills with
                  invalid character_id.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&only_with_tag=release_0_7_2&r1=1.1412.2.97&r2=1.1412.2.98
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/render_handler_agg_style.h?cvsroot=gnash&only_with_tag=release_0_7_2&r1=1.3.2.4&r2=1.3.2.5
http://cvs.savannah.gnu.org/viewcvs/gnash/server/styles.cpp?cvsroot=gnash&only_with_tag=release_0_7_2&r1=1.22&r2=1.22.2.1
http://cvs.savannah.gnu.org/viewcvs/gnash/server/styles.h?cvsroot=gnash&only_with_tag=release_0_7_2&r1=1.14&r2=1.14.2.1

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1412.2.97
retrieving revision 1.1412.2.98
diff -u -b -r1.1412.2.97 -r1.1412.2.98
--- ChangeLog   6 Nov 2006 16:44:51 -0000       1.1412.2.97
+++ ChangeLog   6 Nov 2006 17:05:36 -0000       1.1412.2.98
@@ -1,3 +1,10 @@
+2006-11-06 Sandro Santilli <address@hidden>
+
+       * backend/render_handler_agg_style.h: comment-out
+         add_bitmap with NULL input warning.
+       * server/styles.{h,cpp}: warn about bitmap fills with
+         invalid character_id.
+
 2006-11-06 Patrice Dumas <address@hidden>
 
        * configure.ac, doc/C/Makefile.am, packaging/redhat/gnash.spec,

Index: backend/render_handler_agg_style.h
===================================================================
RCS file: /sources/gnash/gnash/backend/render_handler_agg_style.h,v
retrieving revision 1.3.2.4
retrieving revision 1.3.2.5
diff -u -b -r1.3.2.4 -r1.3.2.5
--- backend/render_handler_agg_style.h  2 Nov 2006 10:57:39 -0000       1.3.2.4
+++ backend/render_handler_agg_style.h  6 Nov 2006 17:05:36 -0000       1.3.2.5
@@ -300,9 +300,9 @@
       bool repeat, bool smooth) {
       
       if (bi==NULL) {
-        // NOTE: Apparently "bi" can be NULL in some cases and this should not
-        // be treated as an error.
-        log_msg("WARNING: add_bitmap called with bi=NULL");
+       // See server/styles.h comments about when NULL return is possible.
+       // Don't warn here, we already warn at parse-time
+        //log_msg("WARNING: add_bitmap called with bi=NULL");
         add_color(agg::rgba8(0,0,0,0));
         return;
       }

Index: server/styles.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/styles.cpp,v
retrieving revision 1.22
retrieving revision 1.22.2.1
diff -u -b -r1.22 -r1.22.2.1
--- server/styles.cpp   26 Oct 2006 08:20:09 -0000      1.22
+++ server/styles.cpp   6 Nov 2006 17:05:36 -0000       1.22.2.1
@@ -158,6 +158,17 @@
 
         // Look up the bitmap character.
         m_bitmap_character = md->get_bitmap_character_def(bitmap_char_id);
+       IF_VERBOSE_MALFORMED_SWF(
+               if ( m_bitmap_character == NULL )
+               {
+                       log_warning("Bitmap fill specifies '%d' as associated"
+                               " bitmap character id,"
+                               " but that character is not found"
+                               " in the Characters Dictionary"
+                               " - Malformed SWF?",
+                               bitmap_char_id);
+               }
+       );
 
         matrix m;
         m.read(in);

Index: server/styles.h
===================================================================
RCS file: /sources/gnash/gnash/server/styles.h,v
retrieving revision 1.14
retrieving revision 1.14.2.1
diff -u -b -r1.14 -r1.14.2.1
--- server/styles.h     26 Oct 2006 08:20:09 -0000      1.14
+++ server/styles.h     6 Nov 2006 17:05:36 -0000       1.14.2.1
@@ -5,7 +5,7 @@
 
 // Fill and line style types.
 
-/* $Id: styles.h,v 1.14 2006/10/26 08:20:09 udog Exp $ */
+/* $Id: styles.h,v 1.14.2.1 2006/11/06 17:05:36 strk Exp $ */
 
 #ifndef GNASH_STYLES_H
 #define GNASH_STYLES_H
@@ -71,6 +71,15 @@
        void    set_lerp(const fill_style& a, const fill_style& b, float t);
        
        /// Returns the bitmap info for all styles except solid fills
+       //
+       /// NOTE: calling this method against a solid fill style will
+       ///       result in a failed assertion.
+       /// 
+       /// NOTE2: this function can return NULL if the character_id
+       ///        specified for the style in the SWF does not resolve
+       ///        to a character defined in the characters dictionary.
+       ///        (it happens..)
+       ///
        bitmap_info* get_bitmap_info() const;
        
        /// Returns the bitmap transformation matrix