[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    extragear/multimedia/kmplayer
From:       Koos Vriezen <koos.vriezen () gmail ! com>
Date:       2011-10-11 20:51:40
Message-ID: 20111011205140.E0CC4AC887 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1258515 by vriezen:

Interpreter missing animateColor 'from' or 'values' as transparent

 M  +5 -1      src/kmplayer_smil.cpp  
 M  +1 -1      tests/smil_text.smil  


--- trunk/extragear/multimedia/kmplayer/src/kmplayer_smil.cpp #1258514:1258515
@@ -1248,6 +1248,8 @@
 {
     if (val.isEmpty () || val == "transparent")
         color = 0;
+    else if (val.startsWith (QChar ('#')) && val.length() == 9)
+        color = val.mid (1).toUInt (NULL, 16);
     else
         color = setRGBA (QColor (val).rgba (), opacity);
 }
@@ -5393,6 +5395,8 @@
 }
 
 static bool getAnimateColor (const QString &val, SMIL::AnimateColor::Channels &c) {
+    if (val.isEmpty ())
+        return getAnimateColor (0, c);
     QColor color (val);
     return getAnimateColor (color.rgba (), c);
 }
@@ -5494,7 +5498,7 @@
     Node *target = target_element.ptr ();
     if (target) {
         QString val; // TODO make more efficient
-        val.sprintf ("#%06x", 0xffffff & cur_c.argb ());
+        val.sprintf ("#%08x", cur_c.argb ());
         static_cast <Element *> (target)->setParam (changed_attribute, val);
     }
 }
--- trunk/extragear/multimedia/kmplayer/tests/smil_text.smil #1258514:1258515
@@ -49,7 +49,7 @@
                      calcMode="spline" keySplines=".5 0 .5 1" fill="freeze"/>
       <animate target="text1" begin="3" dur="4" attributeName="textFontSize"
                calcMode="discrete" values="12;14;16;18;20"/>
-      <animateColor target="text1" begin="2" dur="1" from="#475360" to="white" fill="freeze"/>
+      <animateColor target="text1" begin="2" dur="1" to="white" fill="freeze"/>
     </par>
     <par>
       <smilText begin="1.5s" region="r1" textFontSize="24px" textColor="white">
[prev in list] [next in list] [prev in thread] [next in thread]