projects
/
platform
/
upstream
/
efl.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
a27561b
)
edje: fix float comparison warning in edje_pick.
author
Cedric BAIL
<cedric@osg.samsung.com>
Tue, 20 Dec 2016 23:46:43 +0000
(15:46 -0800)
committer
Cedric BAIL
<cedric@osg.samsung.com>
Wed, 21 Dec 2016 00:39:30 +0000
(16:39 -0800)
src/bin/edje/edje_pick.c
patch
|
blob
|
history
diff --git
a/src/bin/edje/edje_pick.c
b/src/bin/edje/edje_pick.c
index
a4a2b22
..
79a361c
100644
(file)
--- a/
src/bin/edje/edje_pick.c
+++ b/
src/bin/edje/edje_pick.c
@@
-558,7
+558,7
@@
_edje_pick_output_prepare(Edje_File *o, Edje_File *edf, char *name)
if (o->feature_ver < edf->feature_ver)
o->feature_ver = edf->feature_ver;
}
- if (
o->base_scale != edf->base_scale
)
+ if (
NEQ(o->base_scale, edf->base_scale)
)
{
EINA_LOG_ERR("Error: Merging files of various base scale. Base scale of the files should be same.\n");
free(o);