Changeset 9569

Timestamp:

01/28/09 12:59:06 (4 years ago)

Author:

robert

Message:

From Mathias Froehlich, "I have today built svn trunk on HP-UX and Solaris8.
I had to do two small changes to src/osgWidget/Input.cpp and
src/osgAnimation/Animation.cpp mainly because of name lookup problems.
"

Location:

OpenSceneGraph/trunk/src

Files:

• osgAnimation/Animation.cpp (modified) (2 diffs)
• osgWidget/Input.cpp (modified) (1 diff)

OpenSceneGraph/trunk/src/osgAnimation/Animation.cpp

@@ -113 +113 @@
             t = _startTime;
         else if (t > _duration)
-            t = fmodf(t, _duration);
+            t = fmod(t, (float)_duration);
         //      std::cout << "t " << t << " duration " << _duration << std::endl;
         break;
@@ -122 +122 @@
         {
             int tt = (int) (t / _duration);
-            t = fmodf(t, _duration);
+            t = fmod(t, (float)_duration);
             if (tt%2)
                 t = _duration - t;

OpenSceneGraph/trunk/src/osgWidget/Input.cpp

@@ -176 +176 @@
         osgText::Font*        font  = const_cast<osgText::Font*>(_text->getFont());
         osgText::Font::Glyph* glyph = font->getGlyph(fr, *i);
-        unsigned int          d     = abs(glyph->getHorizontalBearing().y());
+        unsigned int          d     = abs((int)glyph->getHorizontalBearing().y());
 
         if(d > descent) descent = d;