summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>2016-03-01 13:37:39 +0900
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2016-03-01 13:37:39 +0900
commit1859d8b64b200d26f8c91f1b2e6352a574a33616 (patch)
treee709797b9222f688675f35ab0b72b3cf03fbd204
parent8c9acb744dea51ffe3bd38db454e7f2cef6a7c7f (diff)
elm map: silence uninit var warnings that new gcc versions show
gcc thinks the vars may in theory be uniitiialized. it's right but it won't actually happen. but having noise in warning output is bad, so fix the warnings so we can focus on the real bugs/issues/warnings
-rw-r--r--src/lib/elm_map.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/elm_map.c b/src/lib/elm_map.c
index 395e4462c..3b10cc579 100644
--- a/src/lib/elm_map.c
+++ b/src/lib/elm_map.c
@@ -518,7 +518,7 @@ _coord_to_canvas_no_rotation(Elm_Map_Data *sd,
518 Evas_Coord *xx, 518 Evas_Coord *xx,
519 Evas_Coord *yy) 519 Evas_Coord *yy)
520{ 520{
521 Evas_Coord vx, vy, sx, sy; 521 Evas_Coord vx = 0, vy = 0, sx = 0, sy = 0;
522 522
523 _viewport_coord_get(sd, &vx, &vy, NULL, NULL); 523 _viewport_coord_get(sd, &vx, &vy, NULL, NULL);
524 evas_object_geometry_get(sd->pan_obj, &sx, &sy, NULL, NULL); 524 evas_object_geometry_get(sd->pan_obj, &sx, &sy, NULL, NULL);
@@ -548,7 +548,7 @@ _canvas_to_coord(Elm_Map_Data *sd,
548 Evas_Coord *xx, 548 Evas_Coord *xx,
549 Evas_Coord *yy) 549 Evas_Coord *yy)
550{ 550{
551 Evas_Coord vx, vy, sx, sy; 551 Evas_Coord vx = 0, vy = 0, sx = 0, sy = 0;
552 552
553 _viewport_coord_get(sd, &vx, &vy, NULL, NULL); 553 _viewport_coord_get(sd, &vx, &vy, NULL, NULL);
554 evas_object_geometry_get(sd->pan_obj, &sx, &sy, NULL, NULL); 554 evas_object_geometry_get(sd->pan_obj, &sx, &sy, NULL, NULL);
@@ -576,8 +576,8 @@ _grid_item_coord_get(Grid_Item *gi,
576static Eina_Bool 576static Eina_Bool
577_grid_item_in_viewport(Grid_Item *gi) 577_grid_item_in_viewport(Grid_Item *gi)
578{ 578{
579 Evas_Coord vx, vy, vw, vh; 579 Evas_Coord vx = 0, vy = 0, vw = 0, vh = 0;
580 Evas_Coord x, y, w, h; 580 Evas_Coord x = 0, y = 0, w = 0, h = 0;
581 581
582 EINA_SAFETY_ON_NULL_RETURN_VAL(gi, EINA_FALSE); 582 EINA_SAFETY_ON_NULL_RETURN_VAL(gi, EINA_FALSE);
583 583
@@ -4342,7 +4342,7 @@ EOLIAN static void
4342_elm_map_region_get(Eo *obj EINA_UNUSED, Elm_Map_Data *sd, double *lon, double *lat) 4342_elm_map_region_get(Eo *obj EINA_UNUSED, Elm_Map_Data *sd, double *lon, double *lat)
4343{ 4343{
4344 double tlon, tlat; 4344 double tlon, tlat;
4345 Evas_Coord vx, vy, vw, vh; 4345 Evas_Coord vx = 0, vy = 0, vw = 0, vh = 0;
4346 4346
4347 _viewport_coord_get(sd, &vx, &vy, &vw, &vh); 4347 _viewport_coord_get(sd, &vx, &vy, &vw, &vh);
4348 _coord_to_region_convert 4348 _coord_to_region_convert