forked from enlightenment/efl
evas render2 - move empty region data into const land so it is in RO mem
this should ensure these constants are in read-only memory if possible iof they are marked as const as well as static
This commit is contained in:
parent
1585d242da
commit
e167154520
|
@ -172,9 +172,9 @@ if (((num) < ((reg)->data->size >> 1)) && ((reg)->data->size > 50)) { \
|
||||||
rects[b] = __t; \
|
rects[b] = __t; \
|
||||||
}
|
}
|
||||||
|
|
||||||
static Box _region_emptybox = {0, 0, 0, 0};
|
static const Box _region_emptybox = {0, 0, 0, 0};
|
||||||
static Region_Data _region_emptydata = {0, 0};
|
static const Region_Data _region_emptydata = {0, 0};
|
||||||
static Region_Data _region_brokendata = {0, 0};
|
static const Region_Data _region_brokendata = {0, 0};
|
||||||
|
|
||||||
static Eina_Bool _region_break(Region *region);
|
static Eina_Bool _region_break(Region *region);
|
||||||
|
|
||||||
|
@ -183,7 +183,7 @@ _region_break(Region *region)
|
||||||
{
|
{
|
||||||
FREE_DATA(region);
|
FREE_DATA(region);
|
||||||
region->bound = _region_emptybox;
|
region->bound = _region_emptybox;
|
||||||
region->data = &_region_brokendata;
|
region->data = (Region_Data *)&_region_brokendata;
|
||||||
return EINA_FALSE;
|
return EINA_FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -337,12 +337,12 @@ _region_op(Region *dest, // Place to store result
|
||||||
if (((dest == reg1) && (new_size > 1)) || ((dest == reg2) && (num > 1)))
|
if (((dest == reg1) && (new_size > 1)) || ((dest == reg2) && (num > 1)))
|
||||||
{
|
{
|
||||||
old_data = dest->data;
|
old_data = dest->data;
|
||||||
dest->data = &_region_emptydata;
|
dest->data = (Region_Data *)&_region_emptydata;
|
||||||
}
|
}
|
||||||
// guess at new size
|
// guess at new size
|
||||||
if (num > new_size) new_size = num;
|
if (num > new_size) new_size = num;
|
||||||
new_size <<= 1;
|
new_size <<= 1;
|
||||||
if (!dest->data) dest->data = &_region_emptydata;
|
if (!dest->data) dest->data = (Region_Data *)&_region_emptydata;
|
||||||
else if (dest->data->size)
|
else if (dest->data->size)
|
||||||
dest->data->num = 0;
|
dest->data->num = 0;
|
||||||
if (new_size > dest->data->size)
|
if (new_size > dest->data->size)
|
||||||
|
@ -468,7 +468,7 @@ _region_op(Region *dest, // Place to store result
|
||||||
if (!(num = dest->data->num))
|
if (!(num = dest->data->num))
|
||||||
{
|
{
|
||||||
FREE_DATA(dest);
|
FREE_DATA(dest);
|
||||||
dest->data = &_region_emptydata;
|
dest->data = (Region_Data *)&_region_emptydata;
|
||||||
}
|
}
|
||||||
else if (num == 1)
|
else if (num == 1)
|
||||||
{
|
{
|
||||||
|
@ -718,7 +718,7 @@ region_new(int w, int h)
|
||||||
Region *region = calloc(1, sizeof(Region));
|
Region *region = calloc(1, sizeof(Region));
|
||||||
if (!region) return NULL;
|
if (!region) return NULL;
|
||||||
region->bound = _region_emptybox;
|
region->bound = _region_emptybox;
|
||||||
region->data = &_region_emptydata;
|
region->data = (Region_Data *)&_region_emptydata;
|
||||||
region->w = w;
|
region->w = w;
|
||||||
region->h = h;
|
region->h = h;
|
||||||
return region;
|
return region;
|
||||||
|
@ -796,10 +796,10 @@ region_intersect(Region *dest, Region *source)
|
||||||
dest->bound.y2 = dest->bound.y1;
|
dest->bound.y2 = dest->bound.y1;
|
||||||
if (PIXREGION_NAR(dest) || PIXREGION_NAR(source))
|
if (PIXREGION_NAR(dest) || PIXREGION_NAR(source))
|
||||||
{
|
{
|
||||||
dest->data = &_region_brokendata;
|
dest->data = (Region_Data *)&_region_brokendata;
|
||||||
return EINA_FALSE;
|
return EINA_FALSE;
|
||||||
}
|
}
|
||||||
else dest->data = &_region_emptydata;
|
else dest->data = (Region_Data *)&_region_emptydata;
|
||||||
}
|
}
|
||||||
else if (!dest->data && !source->data)
|
else if (!dest->data && !source->data)
|
||||||
{
|
{
|
||||||
|
@ -1192,7 +1192,7 @@ region_del(Region *dest, Region *source)
|
||||||
FREE_DATA(dest);
|
FREE_DATA(dest);
|
||||||
dest->bound.x2 = dest->bound.x1;
|
dest->bound.x2 = dest->bound.x1;
|
||||||
dest->bound.y2 = dest->bound.y1;
|
dest->bound.y2 = dest->bound.y1;
|
||||||
dest->data = &_region_emptydata;
|
dest->data = (Region_Data *)&_region_emptydata;
|
||||||
return EINA_TRUE;
|
return EINA_TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1387,7 +1387,7 @@ region_empty(Region *region)
|
||||||
FREE_DATA(region);
|
FREE_DATA(region);
|
||||||
region->bound.x2 = region->bound.x1;
|
region->bound.x2 = region->bound.x1;
|
||||||
region->bound.y2 = region->bound.y1;
|
region->bound.y2 = region->bound.y1;
|
||||||
region->data = &_region_emptydata;
|
region->data = (Region_Data *)&_region_emptydata;
|
||||||
region->last_del.w = 0;
|
region->last_del.w = 0;
|
||||||
region->last_add.w = 0;
|
region->last_add.w = 0;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue