Applied the following dooglus patches from the sourceforge tracker:

[synfig.git] / synfig-core / trunk / src / synfig / time.cpp

diff --git a/synfig-core/trunk/src/synfig/time.cpp b/synfig-core/trunk/src/synfig/time.cpp
index e225633..946ac0b 100644 (file)
--- a/synfig-core/trunk/src/synfig/time.cpp
+++ b/synfig-core/trunk/src/synfig/time.cpp
@@ -1,20 +1,21 @@
-/* === S I N F G =========================================================== */
+/* === S Y N F I G ========================================================= */
 /*!    \file time.cpp
 **     \brief Template File
 **
 **     $Id: time.cpp,v 1.1.1.1 2005/01/04 01:23:15 darco Exp $
 **
 **     \legal
-**     Copyright (c) 2002 Robert B. Quattlebaum Jr.
+**     Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
 **
-**     This software and associated documentation
-**     are CONFIDENTIAL and PROPRIETARY property of
-**     the above-mentioned copyright holder.
+**     This package is free software; you can redistribute it and/or
+**     modify it under the terms of the GNU General Public License as
+**     published by the Free Software Foundation; either version 2 of
+**     the License, or (at your option) any later version.
 **
-**     You may not copy, print, publish, or in any
-**     other way distribute this software without
-**     a prior written agreement with
-**     the copyright holder.
+**     This package is distributed in the hope that it will be useful,
+**     but WITHOUT ANY WARRANTY; without even the implied warranty of
+**     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+**     General Public License for more details.
 **     \endlegal
 */
 /* ========================================================================= */
@@ -48,7 +49,7 @@ extern "C" { int _isnan(double x); }
 #endif
 
 #ifdef __APPLE__
-#define isnan __isnan
+#define isnan __isnanf
 #endif
 
 #endif
@@ -59,7 +60,7 @@ extern "C" { int _isnan(double x); }
 
 using namespace std;
 using namespace etl;
-using namespace sinfg;
+using namespace synfig;
 
 #define tolower ::tolower
 
@@ -76,13 +77,13 @@ Time::Time(const String &str_, float fps):
        std::transform(str.begin(),str.end(),str.begin(),&tolower);
 
        // Start/Begin Of Time
-       if(str=="SOT" || str=="BOT")
+       if(str=="sot" || str=="bot")
        {
                operator=(begin());
                return;
        }
        // End Of Time
-       if(str=="EOT")
+       if(str=="eot")
        {
                operator=(end());
                return;
@@ -104,7 +105,7 @@ Time::Time(const String &str_, float fps):
                        // to warn about units if the value is zero
                        // it is the only case where units are irrelevant.
                        if(amount!=0)
-                               sinfg::warning("Time(): No unit provided in time code, assuming SECONDS (\"%s\")",str.c_str());
+                               synfig::warning("Time(): No unit provided in time code, assuming SECONDS (\"%s\")",str.c_str());
                        value_+=amount;
                        return;
                }
@@ -127,7 +128,7 @@ Time::Time(const String &str_, float fps):
                                if(fps)
                                        value_+=amount/fps;
                                else
-                                       sinfg::warning("Time(): Individual frames referenced, but frame rate is unknown");
+                                       synfig::warning("Time(): Individual frames referenced, but frame rate is unknown");
                                break;
                        case ':':
                                // try to read it in as a traditional time format
@@ -146,12 +147,12 @@ Time::Time(const String &str_, float fps):
                                                return;
                                        }
                                }
-                               sinfg::warning("Time(): Bad time format");
+                               synfig::warning("Time(): Bad time format");
                                break;
 
                        default:
                                value_+=amount;
-                               sinfg::warning("Time(): Unexpected character '%c' when parsing time string \"%s\"",str[pos],str.c_str());
+                               synfig::warning("Time(): Unexpected character '%c' when parsing time string \"%s\"",str[pos],str.c_str());
                                break;
                }
                pos++;