forked from enlightenment/efl
parent
859ffb05fc
commit
f7b38107de
|
@ -251,7 +251,7 @@ evas_hash_modify(Evas_Hash *hash, const char *key, const void *data)
|
|||
hash->buckets[hash_num] = evas_object_list_prepend(hash->buckets[hash_num], el);
|
||||
}
|
||||
old_data = el->data;
|
||||
el->data = data;
|
||||
el->data = (void *) data;
|
||||
return old_data;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -107,6 +107,7 @@ XR_Image *_xre_image_load(Ximage_Info *xinf, char *file, char *key);
|
|||
XR_Image *_xre_image_new_from_data(Ximage_Info *xinf, int w, int h, void *data);
|
||||
XR_Image *_xre_image_new_from_copied_data(Ximage_Info *xinf, int w, int h, void *data);
|
||||
XR_Image *_xre_image_new(Ximage_Info *xinf, int w, int h);
|
||||
void _xre_image_resize(XR_Image *im, int w, int h);
|
||||
void _xre_image_free(XR_Image *im);
|
||||
void _xre_image_region_dirty(XR_Image *im, int x, int y, int w, int h);
|
||||
void _xre_image_dirty(XR_Image *im);
|
||||
|
|
|
@ -77,7 +77,7 @@ _xr_image_info_get(Display *disp, Drawable draw, Visual *vis)
|
|||
if (shm_info.shmid >= 0)
|
||||
{
|
||||
shm_info.shmaddr = xim->data = shmat(shm_info.shmid, 0, 0);
|
||||
if ((shm_info.shmaddr != NULL) && (shm_info.shmaddr != -1))
|
||||
if ((shm_info.shmaddr) && (shm_info.shmaddr != (void *) -1))
|
||||
{
|
||||
XErrorHandler ph;
|
||||
|
||||
|
@ -166,7 +166,7 @@ _xr_image_new(Ximage_Info *xinf, int w, int h, int depth)
|
|||
if (xim->shm_info->shmid >= 0)
|
||||
{
|
||||
xim->shm_info->shmaddr = xim->xim->data = shmat(xim->shm_info->shmid, 0, 0);
|
||||
if ((xim->shm_info->shmaddr != NULL) && (xim->shm_info->shmaddr != -1))
|
||||
if ((xim->shm_info->shmaddr) && (xim->shm_info->shmaddr != (void *) -1))
|
||||
{
|
||||
XErrorHandler ph;
|
||||
|
||||
|
|
Loading…
Reference in New Issue