[Gnash-commit] gnash ChangeLog server/styles.cpp

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/01/11 14:01:10

Modified files:
        .              : ChangeLog 
        server         : styles.cpp 

Log message:
                * server/styles.cpp: warn only once about 1st gradient fill
                  style position != 0. Use log_swferror when appropriate.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2084&r2=1.2085
http://cvs.savannah.gnu.org/viewcvs/gnash/server/styles.cpp?cvsroot=gnash&r1=1.28&r2=1.29

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2084
retrieving revision 1.2085
diff -u -b -r1.2084 -r1.2085
--- ChangeLog   11 Jan 2007 13:29:32 -0000      1.2084
+++ ChangeLog   11 Jan 2007 14:01:10 -0000      1.2085
@@ -1,5 +1,10 @@
 2007-01-11 Sandro Santilli <address@hidden>
 
+       * server/styles.cpp: warn only once about 1st gradient fill
+         style position != 0. Use log_swferror when appropriate.
+
+2007-01-11 Sandro Santilli <address@hidden>
+
        * server/asobj/Global.cpp: always provide the Function
          and System classes. Add a note about possibly bogus
          approach of making classes available based on SWF

Index: server/styles.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/styles.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- server/styles.cpp   9 Jan 2007 23:26:32 -0000       1.28
+++ server/styles.cpp   11 Jan 2007 14:01:10 -0000      1.29
@@ -117,7 +117,7 @@
         if ( ! num_gradients )
        {
                IF_VERBOSE_MALFORMED_SWF(
-                       log_warning("Malformed SWF: num gradients 0");
+                       log_swferror("num gradients 0");
                );
                return;
        }
@@ -175,7 +175,7 @@
                static bool warned_about_invalid_char=false;
                if ( ! warned_about_invalid_char )
                {
-                       log_warning("Bitmap fill specifies '%d' as associated"
+                       log_swferror("Bitmap fill specifies '%d' as associated"
                                " bitmap character id,"
                                " but that character is not found"
                                " in the Characters Dictionary."
@@ -259,14 +259,22 @@
        assert(m_gradients.size());
 
        // By specs, first gradient should *always* be 0, 
-       // anyway a malformed SWF could break this we cannot rely on that 
information...
+       // anyway a malformed SWF could break this,
+       // so we cannot rely on that information...
        if (ratio < m_gradients[0].m_ratio)
        {
                IF_VERBOSE_MALFORMED_SWF(
-                       log_warning("MALFORMED SWF: "
+                       static bool warned=false;
+                       if ( ! warned ) {
+                       log_swferror(
                                "First gradient in a fill_style "
-                               "have position==%d (expected 0)",
+                               "have position==%d (expected 0)."
+                               " This seems to be common, so will"
+                               " warn only once."
+                               ,
                                m_gradients[0].m_ratio);
+                       warned=true;
+                       }
                );
                return m_gradients[0].m_color;
        }
@@ -295,7 +303,7 @@
                        // Ratios are equal IFF first and second gradient_record
                        // have the same ratio. This would be a malformed SWF.
                        IF_VERBOSE_MALFORMED_SWF(
-                               log_warning("MALFORMED SWF: "
+                               log_swferror(
                                        "two gradients in a fill_style "
                                        "have the same position/ratio: %d",
                                        gr0.m_ratio);