On 04/09/12 10:03, Chris Michael wrote: > Thank you Hermit !! :) s/Hermit/Hermet.
I've been wanted to do that for a long time now ... > except if I would have done it, people would have complained, so thanks for > taking some initiative here :) > dh > > -----Original Message----- > From: Enlightenment SVN [mailto:no-re...@enlightenment.org] > Sent: 04 September 2012 09:57 > To: enlightenment-...@lists.sourceforge.net > Subject: E SVN: hermet trunk/evas/src/lib/canvas > > Log: > evas/evas_object_image - use Eina_Bool > > > > Author: hermet > Date: 2012-09-04 01:56:46 -0700 (Tue, 04 Sep 2012) > New Revision: 76115 > Trac: http://trac.enlightenment.org/e/changeset/76115 > > Modified: > trunk/evas/src/lib/canvas/evas_object_image.c > > Modified: trunk/evas/src/lib/canvas/evas_object_image.c > =================================================================== > --- trunk/evas/src/lib/canvas/evas_object_image.c 2012-09-04 08:42:38 > UTC (rev 76114) > +++ trunk/evas/src/lib/canvas/evas_object_image.c 2012-09-04 08:56:46 > UTC (rev 76115) > @@ -82,15 +82,14 @@ > > void *engine_data; > > - unsigned char changed : 1; > - unsigned char dirty_pixels : 1; > - unsigned char filled : 1; > - unsigned char proxyrendering : 1; > - unsigned char preloading : 1; > - unsigned char video_rendering : 1; > - unsigned char video_surface : 1; > - unsigned char video_visible : 1; > - unsigned char created : 1; > + Eina_Bool changed : 1; > + Eina_Bool dirty_pixels : 1; > + Eina_Bool filled : 1; > + Eina_Bool proxyrendering : 1; > + Eina_Bool preloading : 1; > + Eina_Bool video_surface : 1; > + Eina_Bool video_visible : 1; > + Eina_Bool created : 1; > }; > > /* private methods for image objects */ @@ -159,7 +158,7 @@ { > if ((o->preloading) && (o->engine_data)) > { > - o->preloading = 0; > + o->preloading = EINA_FALSE; > > obj->layer->evas->engine.func->image_data_preload_cancel(obj->layer->evas->e > ngine.data.output, > > o->engine_data, > obj); @@ > -356,7 +355,7 @@ > { > if (o->preloading) > { > - o->preloading = 0; > + o->preloading = EINA_FALSE; > > obj->layer->evas->engine.func->image_data_preload_cancel(obj->layer->evas->e > ngine.data.output, o->engine_data, obj); > } > > obj->layer->evas->engine.func->image_free(obj->layer->evas->engine.data.outp > ut, o->engine_data); @@ -402,7 +401,7 @@ > o->cur.image.h = 0; > o->cur.image.stride = 0; > } > - o->changed = 1; > + o->changed = EINA_TRUE; > evas_object_change(obj); > } > > @@ -529,7 +528,7 @@ > o->cur.border.t = t; > o->cur.border.b = b; > o->cur.opaque_valid = 0; > - o->changed = 1; > + o->changed = EINA_TRUE; > evas_object_change(obj); > } > > @@ -573,7 +572,7 @@ > MAGIC_CHECK_END(); > if (fill == o->cur.border.fill) return; > o->cur.border.fill = fill; > - o->changed = 1; > + o->changed = EINA_TRUE; > evas_object_change(obj); > } > > @@ -655,7 +654,7 @@ > MAGIC_CHECK_END(); > if (scale == o->cur.border.scale) return; > o->cur.border.scale = scale; > - o->changed = 1; > + o->changed = EINA_TRUE; > evas_object_change(obj); > } > > @@ -701,7 +700,7 @@ > o->cur.fill.w = w; > o->cur.fill.h = h; > o->cur.opaque_valid = 0; > - o->changed = 1; > + o->changed = EINA_TRUE; > evas_object_change(obj); > } > > @@ -746,7 +745,7 @@ > MAGIC_CHECK_END(); > if (spread == (Evas_Fill_Spread)o->cur.spread) return; > o->cur.spread = spread; > - o->changed = 1; > + o->changed = EINA_TRUE; > evas_object_change(obj); > } > > @@ -822,7 +821,7 @@ > > o->cur.has_alpha); > */ > EVAS_OBJECT_IMAGE_FREE_FILE_AND_KEY(o); > - o->changed = 1; > + o->changed = EINA_TRUE; > evas_object_change(obj); > } > > @@ -892,7 +891,7 @@ > MAGIC_CHECK_END(); > if ((o->preloading) && (o->engine_data)) > { > - o->preloading = 0; > + o->preloading = EINA_FALSE; > > obj->layer->evas->engine.func->image_data_preload_cancel(obj->layer->evas->e > ngine.data.output, o->engine_data, obj); > } > if (!o->engine_data) return NULL; > @@ -986,7 +985,7 @@ > EVAS_OBJECT_IMAGE_FREE_FILE_AND_KEY(o); > o->pixels_checked_out = 0; > } > - o->changed = 1; > + o->changed = EINA_TRUE; > evas_object_change(obj); > } > > @@ -1054,7 +1053,7 @@ > MAGIC_CHECK_END(); > if (!o->engine_data) > { > - o->preloading = 1; > + o->preloading = EINA_TRUE; > evas_object_inform_call_image_preloaded(obj); > return; > } > @@ -1064,7 +1063,7 @@ > { > if (o->preloading) > { > - o->preloading = 0; > + o->preloading = EINA_FALSE; > > obj->layer->evas->engine.func->image_data_preload_cancel(obj->layer->evas->e > ngine.data.output, > > o->engine_data, > obj); > @@ -1074,7 +1073,7 @@ > { > if (!o->preloading) > { > - o->preloading = 1; > + o->preloading = EINA_TRUE; > > obj->layer->evas->engine.func->image_data_preload_request(obj->layer->evas-> > engine.data.output, > > o->engine_data, > > obj); @@ -1153,7 +1152,7 @@ > if ((w <= 0) || (h <= 0)) return; > NEW_RECT(r, x, y, w, h); > if (r) o->pixel_updates = eina_list_append(o->pixel_updates, r); > - o->changed = 1; > + o->changed = EINA_TRUE; > evas_object_change(obj); > } > > @@ -1171,7 +1170,7 @@ > MAGIC_CHECK_END(); > if ((o->preloading) && (o->engine_data)) > { > - o->preloading = 0; > + o->preloading = EINA_FALSE; > > obj->layer->evas->engine.func->image_data_preload_cancel(obj->layer->evas->e > ngine.data.output, > > o->engine_data, > obj); @@ > -1184,7 +1183,7 @@ > { > int stride = 0; > > - o->engine_data = > + o->engine_data = > > obj->layer->evas->engine.func->image_alpha_set(obj->layer->evas->engine.data > .output, > o->engine_data, > o->cur.has_alpha); > @@ -1240,7 +1239,7 @@ > ((!smooth_scale) && (!o->cur.smooth_scale))) > return; > o->cur.smooth_scale = smooth_scale; > - o->changed = 1; > + o->changed = EINA_TRUE; > evas_object_change(obj); > } > > @@ -1273,7 +1272,7 @@ > MAGIC_CHECK_END(); > if ((o->preloading) && (o->engine_data)) > { > - o->preloading = 0; > + o->preloading = EINA_FALSE; > > obj->layer->evas->engine.func->image_data_preload_cancel(obj->layer->evas->e > ngine.data.output, > > o->engine_data, > obj); @@ > -1287,7 +1286,7 @@ > evas_object_image_load(obj); > o->prev.file = NULL; > o->prev.key = NULL; > - o->changed = 1; > + o->changed = EINA_TRUE; > evas_object_change(obj); > } > > @@ -1398,7 +1397,7 @@ > > obj->layer->evas->engine.func->image_alpha_set(obj->layer->evas->engine.data > .output, > > o->engine_data, > > o->cur.has_alpha); > - o->changed = 1; > + o->changed = EINA_TRUE; > evas_object_change(obj); > } > } > @@ -1421,7 +1420,7 @@ > if (o->engine_data) > o->engine_data = > > obj->layer->evas->engine.func->image_alpha_set(obj->layer->evas->engine.data > .output, o->engine_data, o->cur.has_alpha); > - o->changed = 1; > + o->changed = EINA_TRUE; > evas_object_change(obj); > } > } > @@ -1462,9 +1461,9 @@ > MAGIC_CHECK(o, Evas_Object_Image, MAGIC_OBJ_IMAGE); > return; > MAGIC_CHECK_END(); > - if (dirty) o->dirty_pixels = 1; > - else o->dirty_pixels = 0; > - o->changed = 1; > + if (dirty) o->dirty_pixels = EINA_TRUE; > + else o->dirty_pixels = EINA_FALSE; > + o->changed = EINA_TRUE; > evas_object_change(obj); > } > > @@ -1503,7 +1502,7 @@ > evas_object_image_unload(obj, 0); > evas_object_inform_call_image_unloaded(obj); > evas_object_image_load(obj); > - o->changed = 1; > + o->changed = EINA_TRUE; > evas_object_change(obj); > } > } > @@ -1543,7 +1542,7 @@ > evas_object_image_unload(obj, 0); > evas_object_inform_call_image_unloaded(obj); > evas_object_image_load(obj); > - o->changed = 1; > + o->changed = EINA_TRUE; > evas_object_change(obj); > } > } > @@ -1583,7 +1582,7 @@ > evas_object_image_unload(obj, 0); > evas_object_inform_call_image_unloaded(obj); > evas_object_image_load(obj); > - o->changed = 1; > + o->changed = EINA_TRUE; > evas_object_change(obj); > } > } > @@ -1626,7 +1625,7 @@ > evas_object_image_unload(obj, 0); > evas_object_inform_call_image_unloaded(obj); > evas_object_image_load(obj); > - o->changed = 1; > + o->changed = EINA_TRUE; > evas_object_change(obj); > } > } > @@ -1729,7 +1728,7 @@ > _evas_object_image_cleanup(obj, o); > if (o->video_surface) > { > - o->video_surface = 0; > + o->video_surface = EINA_FALSE; > obj->layer->evas->video_objects = > eina_list_remove(obj->layer->evas->video_objects, obj); > } > > @@ -1745,14 +1744,14 @@ > return ; > > o->created = EINA_TRUE; > - o->video_surface = 1; > + o->video_surface = EINA_TRUE; > o->video = *surf; > > obj->layer->evas->video_objects = > eina_list_append(obj->layer->evas->video_objects, obj); > } > else > { > - o->video_surface = 0; > + o->video_surface = EINA_FALSE; > o->video.update_pixels = NULL; > o->video.move = NULL; > o->video.resize = NULL; > @@ -2087,7 +2086,7 @@ > o->prev.frame = o->cur.frame; > o->cur.frame = frame_index; > > - o->changed = 1; > + o->changed = EINA_TRUE; > evas_object_change(obj); > > } > @@ -2141,7 +2140,7 @@ > if (o->magic == MAGIC_OBJ_IMAGE) > { > evas_object_image_load(obj); > - o->changed = 1; > + o->changed = EINA_TRUE; > evas_object_change(obj); > } > } > @@ -2544,7 +2543,7 @@ > { > if (o->preloading) > { > - o->preloading = 0; > + o->preloading = EINA_FALSE; > > obj->layer->evas->engine.func->image_data_preload_cancel(obj->layer->evas->e > ngine.data.output, > > o->engine_data, > obj); > @@ -2728,7 +2727,7 @@ > { > if (o->preloading) > { > - o->preloading = 0; > + o->preloading = EINA_FALSE; > > obj->layer->evas->engine.func->image_data_preload_cancel(obj->layer->evas->e > ngine.data.output, > > o->engine_data, > obj); > @@ -2738,7 +2737,7 @@ > } > if (o->video_surface) > { > - o->video_surface = 0; > + o->video_surface = EINA_FALSE; > obj->layer->evas->video_objects = > eina_list_remove(obj->layer->evas->video_objects, obj); > } > o->engine_data = NULL; > @@ -2842,14 +2841,14 @@ > } > else > { > - o->proxyrendering = 1; > + o->proxyrendering = EINA_TRUE; > _proxy_subrender(obj->layer->evas, o->cur.source); > pixels = o->cur.source->proxy.surface; > imagew = o->cur.source->proxy.w; > imageh = o->cur.source->proxy.h; > uvw = imagew; > uvh = imageh; > - o->proxyrendering = 0; > + o->proxyrendering = EINA_FALSE; > } > > #if 0 // filtering disabled > @@ -2939,7 +2938,7 @@ > (obj->layer->evas->engine.data.output, o->engine_data, > 0, 0, o->cur.image.w, o->cur.image.h); > } > - o->dirty_pixels = 0; > + o->dirty_pixels = EINA_FALSE; > } > if ((obj->cur.map) && (obj->cur.map->count > 3) && > (obj->cur.usemap)) > { > @@ -3449,7 +3448,7 @@ > /* move cur to prev safely for object data */ > evas_object_cur_prev(obj); > o->prev = o->cur; > - o->changed = 0; > + o->changed = EINA_FALSE; > /* FIXME: copy strings across */ > } > > @@ -3914,7 +3913,7 @@ > /* Cancel dirty on the image */ > Eina_Rectangle *r; > > - o->dirty_pixels = 0; > + o->dirty_pixels = EINA_FALSE; > EINA_LIST_FREE(o->pixel_updates, r) > eina_rectangle_free(r); > } > > ------------------------------------------------------------------------------ Live Security Virtual Conference Exclusive live event will cover all the ways today's security and threat landscape has changed and how IT managers can respond. Discussions will include endpoint security, mobile security and the latest in malware threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/ _______________________________________________ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
