cedric pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=e6ed156e390919b8cd4fef4145cbc3abf075ebbf

commit e6ed156e390919b8cd4fef4145cbc3abf075ebbf
Author: kumar navneet <k.navn...@samsung.com>
Date:   Wed May 13 16:18:47 2015 +0200

    edje: fix parsing issue in edje_cc with bezier program transition.
    
    Summary:
    Issue: "CURRENT" param not considered while parsing cubic bezier transition 
in edje cc
    Soln: parse 5,6 parameter if Curr is set else parse 4,5 parameter
    
    Reviewers: cedric, shilpasingh
    
    Reviewed By: shilpasingh
    
    Subscribers: poornima.srinivasan, rajeshps, cedric, govi
    
    Differential Revision: https://phab.enlightenment.org/D2488
    
    Signed-off-by: Cedric BAIL <ced...@osg.samsung.com>
---
 AUTHORS                         |  1 +
 src/bin/edje/edje_cc_handlers.c | 18 ++++++++++++++----
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 44c5c0e..46cb69b 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -320,6 +320,7 @@ Andrii Kroitor <an.kroi...@samsung.com>
 Vorobiov Vitalii <vi.vorob...@samsung.com>
 m.biliavskyi <m.biliavs...@samsung.com>
 Vyacheslav Reutskiy <v.reuts...@samsung.com>
+Kumar Navneet <k.navn...@samsung.com>
 
 Emotion
 -------
diff --git a/src/bin/edje/edje_cc_handlers.c b/src/bin/edje/edje_cc_handlers.c
index fe11ddb..78d11bb 100644
--- a/src/bin/edje/edje_cc_handlers.c
+++ b/src/bin/edje/edje_cc_handlers.c
@@ -12390,10 +12390,20 @@ st_collections_group_programs_program_transition(void)
            FROM_DOUBLE(parse_float_range(2, -999999999.0, 999999999.0));
         current_program->tween.v2 =
            FROM_DOUBLE(parse_float_range(3, -999999999.0, 999999999.0));
-        current_program->tween.v3 =
-           FROM_DOUBLE(parse_float_range(4, -999999999.0, 999999999.0));
-        current_program->tween.v4 =
-           FROM_DOUBLE(parse_float_range(5, -999999999.0, 999999999.0));
+        if (get_arg_count() == 7)
+          {
+             current_program->tween.v3 =
+                FROM_DOUBLE(parse_float_range(5, -999999999.0, 999999999.0));
+             current_program->tween.v4 =
+                FROM_DOUBLE(parse_float_range(6, -999999999.0, 999999999.0));
+          }
+        else
+          {
+             current_program->tween.v3 =
+                FROM_DOUBLE(parse_float_range(4, -999999999.0, 999999999.0));
+             current_program->tween.v4 =
+                FROM_DOUBLE(parse_float_range(5, -999999999.0, 999999999.0));
+          }
      }
 }
 

-- 


Reply via email to