forked from enlightenment/efl
parent
ccfb163282
commit
c9abcf691d
|
@ -918,12 +918,8 @@ evas_cache_image_drop(Image_Entry *im)
|
|||
EAPI void
|
||||
evas_cache_image_data_not_needed(Image_Entry *im)
|
||||
{
|
||||
Evas_Cache_Image *cache;
|
||||
int references;
|
||||
|
||||
/* FIXME: no one uses this api... well evas_cache_engine_parent_not_needed()
|
||||
* does, but nothing uses that! */
|
||||
cache = im->cache;
|
||||
#ifdef EVAS_FRAME_QUEUING
|
||||
LKL(im->lock_references);
|
||||
#endif
|
||||
|
@ -959,15 +955,13 @@ evas_cache_image_dirty(Image_Entry *im, unsigned int x, unsigned int y, unsigned
|
|||
else
|
||||
#endif
|
||||
{
|
||||
int error;
|
||||
|
||||
im_dirty =
|
||||
evas_cache_image_copied_data(cache, im->w, im->h,
|
||||
evas_cache_image_pixels(im),
|
||||
im->flags.alpha, im->space);
|
||||
if (!im_dirty) goto on_error;
|
||||
if (cache->func.debug) cache->func.debug("dirty-src", im);
|
||||
error = cache->func.dirty(im_dirty, im);
|
||||
cache->func.dirty(im_dirty, im);
|
||||
if (cache->func.debug) cache->func.debug("dirty-out", im_dirty);
|
||||
#ifdef EVAS_FRAME_QUEUING
|
||||
LKL(im_dirty->lock_references);
|
||||
|
@ -1014,15 +1008,13 @@ evas_cache_image_alone(Image_Entry *im)
|
|||
}
|
||||
else
|
||||
{
|
||||
int error;
|
||||
|
||||
im_dirty = evas_cache_image_copied_data(cache, im->w, im->h,
|
||||
evas_cache_image_pixels(im),
|
||||
im->flags.alpha,
|
||||
im->space);
|
||||
if (!im_dirty) goto on_error;
|
||||
if (cache->func.debug) cache->func.debug("dirty-src", im);
|
||||
error = cache->func.dirty(im_dirty, im);
|
||||
cache->func.dirty(im_dirty, im);
|
||||
if (cache->func.debug) cache->func.debug("dirty-out", im_dirty);
|
||||
#ifdef EVAS_FRAME_QUEUING
|
||||
LKL(im_dirty->lock_references);
|
||||
|
|
|
@ -1363,7 +1363,7 @@ _evas_object_box_layout_flow_horizontal_row_info_collect(Evas_Object_Box_Data *p
|
|||
EAPI void
|
||||
evas_object_box_layout_flow_horizontal(Evas_Object *o, Evas_Object_Box_Data *priv, void *data __UNUSED__)
|
||||
{
|
||||
int n_children, v_justify;
|
||||
int n_children;
|
||||
int r, row_count = 0;
|
||||
int min_w = 0, min_h = 0;
|
||||
int max_h, inc_y;
|
||||
|
@ -1398,7 +1398,6 @@ evas_object_box_layout_flow_horizontal(Evas_Object *o, Evas_Object_Box_Data *pri
|
|||
(priv, w, &row_count, row_max_h, row_break, row_width, &offset_y, &max_h);
|
||||
|
||||
inc_y = 0;
|
||||
v_justify = 0;
|
||||
remain_y = h - (offset_y + max_h);
|
||||
|
||||
if (remain_y > 0)
|
||||
|
|
|
@ -3840,9 +3840,7 @@ static void
|
|||
evas_object_image_filled_resize_listener(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj, void *einfo __UNUSED__)
|
||||
{
|
||||
Evas_Coord w, h;
|
||||
Evas_Object_Image *o;
|
||||
|
||||
o = obj->object_data;
|
||||
evas_object_geometry_get(obj, NULL, NULL, &w, &h);
|
||||
evas_object_image_fill_set(obj, 0, 0, w, h);
|
||||
}
|
||||
|
|
|
@ -1091,7 +1091,7 @@ _evas_nv12tiledtorgb_raster(unsigned char **yuv, unsigned char *rgb, int w, int
|
|||
const int offset_value[2] = { 0, 64 * 16 };
|
||||
int mb_x, mb_y, mb_w, mb_h;
|
||||
int base_h;
|
||||
int uv_x, uv_y, uv_step;
|
||||
int uv_x, uv_step;
|
||||
int stride;
|
||||
|
||||
/* Idea iterate over each macroblock and convert each of them using _evas_nv12torgb_raster */
|
||||
|
@ -1128,7 +1128,7 @@ _evas_nv12tiledtorgb_raster(unsigned char **yuv, unsigned char *rgb, int w, int
|
|||
base_h = (mb_h >> 1) + (mb_h & 0x1);
|
||||
stride = w * sizeof (int);
|
||||
|
||||
uv_x = 0; uv_y = 0;
|
||||
uv_x = 0;
|
||||
|
||||
/* In this format we linearize macroblock on two line to form a Z and it's invert */
|
||||
for (mb_y = 0; mb_y < (mb_h >> 1); mb_y++)
|
||||
|
|
|
@ -39,8 +39,6 @@ evas_common_font_init(void)
|
|||
EAPI void
|
||||
evas_common_font_shutdown(void)
|
||||
{
|
||||
int error;
|
||||
|
||||
if (initialised < 1) return;
|
||||
initialised--;
|
||||
if (initialised != 0) return;
|
||||
|
@ -53,7 +51,7 @@ evas_common_font_shutdown(void)
|
|||
evas_common_font_cache_set(0);
|
||||
evas_common_font_flush();
|
||||
|
||||
error = FT_Done_FreeType(evas_ft_lib);
|
||||
FT_Done_FreeType(evas_ft_lib);
|
||||
#ifdef EVAS_FRAME_QUEUING
|
||||
evas_common_font_draw_finish();
|
||||
#endif
|
||||
|
|
|
@ -744,7 +744,7 @@ _evas_draw_line_aa(RGBA_Image *dst, RGBA_Draw_Context *dc, int x0, int y0, int x
|
|||
int dx, dy, rx, by, p0_in, p1_in, dh, a_a = 1;
|
||||
int delx, dely, xx, yy, dxx, dyy;
|
||||
int clx, cly, clw, clh;
|
||||
int dstw, dsth;
|
||||
int dstw;
|
||||
DATA32 *p, *data, color;
|
||||
RGBA_Gfx_Pt_Func pfunc;
|
||||
|
||||
|
@ -801,7 +801,6 @@ _evas_draw_line_aa(RGBA_Image *dst, RGBA_Draw_Context *dc, int x0, int y0, int x
|
|||
|
||||
data = evas_cache_image_pixels(&dst->cache_entry);
|
||||
dstw = dst->cache_entry.w;
|
||||
dsth = dst->cache_entry.h;
|
||||
|
||||
data += (dstw * cly) + clx;
|
||||
x0 -= clx;
|
||||
|
|
Loading…
Reference in New Issue