[Gnash-commit] /srv/bzr/gnash/trunk r11766: Fix reported bug and unreported bug.

[Benjamin Wolsey]

------------------------------------------------------------
revno: 11766 [merge]
committer: Benjamin Wolsey <address@hidden>
branch nick: trunk
timestamp: Mon 2010-01-18 10:12:45 +0100
message:
  Fix reported bug and unreported bug.
modified:
  libcore/TextField.cpp
  libcore/asobj/Date_as.cpp

=== modified file 'libcore/TextField.cpp'
--- a/libcore/TextField.cpp     2010-01-14 08:11:30 +0000
+++ b/libcore/TextField.cpp     2010-01-18 08:15:33 +0000
@@ -1564,8 +1564,8 @@
                                 else {
                                     hexval.erase(0, 1);
                                     // font COLOR attribute
-                                    rgba color =
-                                        colorFromHexString(attloc->second);
+                                    const rgba color =
+                                        colorFromHexString(hexval);
                                     newrec.setColor(color);
                                 }
                             }

=== modified file 'libcore/asobj/Date_as.cpp'
--- a/libcore/asobj/Date_as.cpp 2010-01-11 06:41:38 +0000
+++ b/libcore/asobj/Date_as.cpp 2010-01-18 08:26:29 +0000
@@ -828,7 +828,6 @@
 //
 // Heaven knows what happens if it is 1.30 localtime and you change the date
 // to the day the clocks go forward.
-
 template<bool utc>
 as_value
 date_setfullyear(const fn_call& fn)
@@ -846,22 +845,10 @@
     }
     else {
         GnashTime gt;
-
         dateToGnashTime(*date, gt, utc);
         gt.year = toInt(fn.arg(0)) - 1900;
-        switch (fn.nargs)
-        {
-            default:
-                IF_VERBOSE_ASCODING_ERRORS(
-                    log_aserror(_("Date.set%sFullYear was called with "
-                        "more than three arguments"), utc ? "UTC" : "");
-                );
-    
-            case 3:
-                gt.monthday = toInt(fn.arg(2));
-            case 2:
-                gt.month = toInt(fn.arg(1));
-        }
+        if (fn.nargs >= 2) gt.month = toInt(fn.arg(1));
+        if (fn.nargs >= 3) gt.monthday = toInt(fn.arg(2));
         gnashTimeToDate(gt, *date, utc);
   }
   return as_value(date->getTimeValue());