Evas: Remove invalid code
authorJean-Philippe Andre <jp.andre@samsung.com>
Mon, 9 May 2016 02:46:11 +0000 (11:46 +0900)
committerJean-Philippe Andre <jp.andre@samsung.com>
Mon, 9 May 2016 02:46:11 +0000 (11:46 +0900)
Since Efl.Canvas.Image and Efl.Canvas.Scene3d inherit from
Evas.Image, the two CHECK(isa) can not be reached, and also the
cast from eo_data_scope_get() would be invalid (it should return
NULL as those classes have no private data).

Also, I believe the CHECK() for texture3d can not be reached
either since texture3d objects are not evas objects.

Ping @zmike

src/lib/evas/canvas/evas_main.c

index 2f7fd0c..ae434d0 100644 (file)
@@ -735,10 +735,6 @@ _image_data_unset(Evas_Object_Protected_Data *obj, Eina_List **list)
      }
    CHECK(EVAS_IMAGE_CLASS, Evas_Image_Data,
          ENFN->image_free(ENDT, data->engine_data))
-   else CHECK(EFL_CANVAS_IMAGE_CLASS, Evas_Image_Data,
-         ENFN->image_free(ENDT, data->engine_data))
-   else CHECK(EFL_CANVAS_SCENE3D_CLASS, Evas_Image_Data,
-         ENFN->image_free(ENDT, data->engine_data))
    else CHECK(EVAS_VG_CLASS, Evas_VG_Data,
         obj->layer->evas->engine.func->ector_free(data->engine_data))
    else CHECK(EFL_CANVAS_POLYGON_CLASS, Efl_Canvas_Polygon_Data,