Tizen 2.4.0 rev3 SDK Public Release

[framework/graphics/dali.git] / dali / internal / update / gestures / scene-graph-pan-gesture.cpp

diff --git a/dali/internal/update/gestures/scene-graph-pan-gesture.cpp b/dali/internal/update/gestures/scene-graph-pan-gesture.cpp
index 58be2b6..af0726e 100644 (file)
--- a/dali/internal/update/gestures/scene-graph-pan-gesture.cpp
+++ b/dali/internal/update/gestures/scene-graph-pan-gesture.cpp
@@ -893,6 +893,7 @@ bool PanGesture::InterpolatePoint( PanInfoHistory& history, unsigned int current
   PanInfoHistoryIter historyBegin = history.begin();
   PanInfoHistoryIter lastIt = history.end();
   bool pointGenerated = false;
+  bool havePreviousPoint = false;
   RelativeVectors newAcceleration;
 
   // Iterate through point history to perform interpolation.
@@ -939,7 +940,7 @@ bool PanGesture::InterpolatePoint( PanInfoHistory& history, unsigned int current
       divisor += 1.0f / timeDelta;
 
       // Acceleration requires a previous point.
-      if( lastIt != history.end() )
+      if( havePreviousPoint )
       {
         // Time delta of input.
         float timeDifference( GetDivisibleTimeDifference( it->time, lastIt->time, 1.0f, OUTPUT_TIME_DIFFERENCE ) );
@@ -949,6 +950,10 @@ bool PanGesture::InterpolatePoint( PanInfoHistory& history, unsigned int current
 
         accelerationDivisor += 1.0f / timeDelta;
       }
+      else
+      {
+        havePreviousPoint = true;
+      }
 
       tapsUsed++;
       lastIt = it;