Changeset 647 for XIOS/branchs

Timestamp:

07/20/15 11:52:26 (9 years ago)

Author:

rlacroix

Message:

Fix a possible overflow when converting a date in seconds since the time origin.

File:

• XIOS/branchs/xios-1.0/src/date.cpp (modified) (1 diff)

XIOS/branchs/xios-1.0/src/date.cpp

@@ -118 +118 @@
       CDate::operator Time(void) const // Non vérifiée, pas optimisée ...
       {
-         // Todo : Tester si la date courante est supérieure à la date initiale.
-         Time retvalue = - relCalendar.getNbSecond(relCalendar.getTimeOrigin())
-                         + relCalendar.getNbSecond(*this);
-
-         if ((relCalendar.getId().compare("D360")    == 0) ||
-             (relCalendar.getId().compare("AllLeap") == 0) ||
-             (relCalendar.getId().compare("NoLeap")  == 0))
-         return (retvalue + (getYear() - relCalendar.getTimeOrigin().getYear())
-                                       * relCalendar.getYearTotalLength(*this));
-
-         for(CDate _d(relCalendar.getTimeOrigin());
-            _d.getYear() < getYear(); _d.setYear(_d.getYear()+1))
-            retvalue += relCalendar.getYearTotalLength(_d);
-         return (retvalue);
+        const CCalendar& c = getRelCalendar();
+
+        // Todo : Tester si la date courante est supérieure à la date initiale.
+        Time t = c.getNbSecond(*this) - c.getNbSecond(c.getTimeOrigin());
+
+        if (c.getId().compare("D360") == 0 || c.getId().compare("AllLeap") == 0 || c.getId().compare("NoLeap") == 0)
+        {
+          t += Time(getYear() - c.getTimeOrigin().getYear()) * c.getYearTotalLength(*this);
+        }
+        else
+        {
+          for (CDate d(c.getTimeOrigin()); d.getYear() < getYear(); d.setYear(d.getYear() + 1))
+            t += c.getYearTotalLength(d);
+        }
+
+        return t;
       }