* utils/bezier.cpp: use lrint() to avoid rounding issues

* theme/skin.dtd: "" instead of "\0" for default values

diff --git a/modules/gui/skins2/theme/skin.dtd b/modules/gui/skins2/theme/skin.dtd
index 256d4c95c59a14fed63937b48936aa67b75d68ab..98df0f84d1107430a504fac6ca3a123549d5d92a 100644 (file)
--- a/modules/gui/skins2/theme/skin.dtd
+++ b/modules/gui/skins2/theme/skin.dtd
@@ -82,7 +82,7 @@
         rightbottom CDATA   "lefttop"
         image       CDATA   #REQUIRED
         onclick     CDATA   "none"
-        help        CDATA   "\0"
+        help        CDATA   ""
     >
 <!ELEMENT Button EMPTY>
     <!ATTLIST Button
@@ -95,8 +95,8 @@
         down        CDATA   "none"
         over        CDATA   "none"
         action      CDATA   "none"
-        tooltiptext CDATA   "\0"
-        help        CDATA   "\0"
+        tooltiptext CDATA   ""
+        help        CDATA   ""
     >
 <!ELEMENT CheckBox EMPTY>
     <!ATTLIST CheckBox
@@ -114,9 +114,9 @@
         state        CDATA   #REQUIRED
         action1      CDATA   "none"
         action2      CDATA   "none"
-        tooltiptext1 CDATA   "\0"
-        tooltiptext2 CDATA   "\0"
-        help         CDATA   "\0"
+        tooltiptext1 CDATA   ""
+        tooltiptext2 CDATA   ""
+        help         CDATA   ""
     >
 <!ELEMENT Slider EMPTY>
     <!ATTLIST Slider
@@ -132,8 +132,8 @@
         points      CDATA   #REQUIRED
         thickness   CDATA   "10"
         value       CDATA   "none"
-        tooltiptext CDATA   "\0"
-        help        CDATA   "\0"
+        tooltiptext CDATA   ""
+        help        CDATA   ""
     >
 <!ELEMENT RadialSlider EMPTY>
     <!ATTLIST RadialSlider
@@ -148,8 +148,8 @@
         minangle    CDATA   "0"
         maxangle    CDATA   "360"
         value       CDATA   "none"
-        tooltiptext CDATA   "\0"
-        help        CDATA   "\0"
+        tooltiptext CDATA   ""
+        help        CDATA   ""
     >
 <!ELEMENT Text EMPTY>
     <!ATTLIST Text
@@ -157,11 +157,11 @@
         visible     CDATA   "true"
         x           CDATA   "0"
         y           CDATA   "0"
-        text        CDATA   "\0"
+        text        CDATA   ""
         font        CDATA   #REQUIRED
         color       CDATA   "#000000"
         width       CDATA   "0"
-        help        CDATA   "\0"
+        help        CDATA   ""
     >
 <!ELEMENT Playlist (Slider)>
     <!ATTLIST Playlist
@@ -180,5 +180,5 @@
         bgcolor1    CDATA   "#FFFFFF"
         bgcolor2    CDATA   "#FFFFFF"
         selcolor    CDATA   "#0000FF"
-        help        CDATA   "\0"
+        help        CDATA   ""
     >

diff --git a/modules/gui/skins2/utils/bezier.cpp b/modules/gui/skins2/utils/bezier.cpp
index 595d3306c01331492bc5a3c51696bcff631dc1ad..f7a2f2dd1012b16290a026f4c611590c71508bef 100644 (file)
--- a/modules/gui/skins2/utils/bezier.cpp
+++ b/modules/gui/skins2/utils/bezier.cpp
@@ -2,7 +2,7 @@
  * bezier.cpp
  *****************************************************************************
  * Copyright (C) 2003 VideoLAN
- * $Id: bezier.cpp,v 1.4 2004/03/02 21:45:15 ipkiss Exp $
+ * $Id: bezier.cpp,v 1.5 2004/03/03 22:57:15 asmax Exp $
  *
  * Authors: Cyril Deguet     <asmax@via.ecp.fr>
  *          Olivier Teulière <ipkiss@via.ecp.fr>
@@ -189,10 +189,8 @@ void Bezier::computePoint( float t, int &x, int &y ) const
         yPos += m_pty[i] * coeff;
     }
 
-    // Float cast to avoid strange truncatures
-    // XXX: not very nice...
-    x = (int)(float)xPos;
-    y = (int)(float)yPos;
+    x = lrintf(xPos);
+    y = lrintf(yPos);
 }