Removed a bunch more DEBUGPOINT()s.

[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 255359b..6755b80 100644 (file)
--- a/synfig-core/trunk/src/synfig/time.cpp
+++ b/synfig-core/trunk/src/synfig/time.cpp
@@ -101,7 +101,7 @@ Time::Time(const String &str_, float fps):
        int read;
        float amount;
 
-       // Now try to read it in the letter-abreviated format
+       // Now try to read it in the letter-abbreviated format
        while(pos<str.size() && sscanf(String(str,pos).c_str(),"%f%n",&amount,&read))
        {
                pos+=read;
@@ -193,7 +193,7 @@ Time::get_string(float fps, Time::Format format)const
                int second;
                second=time;time-=second;
 
-               if(fps)
+               if(fps && fps>1)
                {
                        int frame;
                        frame=round_to_int(time*fps);
@@ -219,7 +219,7 @@ Time::get_string(float fps, Time::Format format)const
                started = true;
        }
 
-       if(fps)
+       if(fps && fps>1)
        {
                int second;
                float frame;
@@ -251,7 +251,8 @@ Time::get_string(float fps, Time::Format format)const
 
                                // skip trailing zeros
                                int count = 0;
-                               for (String::reverse_iterator i = seconds.rbegin(); (*i) == '0'; i++)
+                               String::reverse_iterator i = seconds.rbegin();
+                               for ( ; (*i) == '0'; i++)
                                        count++;
 
                                // if we removed too many, go back one place, leaving one zero