From: <enl...@li...> - 2005-10-16 09:34:43
|
Enlightenment CVS committal Author : tsauerbeck Project : e17 Module : libs/evas Dir : e17/libs/evas/src/lib/engines/xrender_x11 Modified Files: evas_engine.h evas_engine_ximage.c Log Message: some warning fixes =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/evas/src/lib/engines/xrender_x11/evas_engine.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- evas_engine.h 8 Oct 2005 04:57:57 -0000 1.4 +++ evas_engine.h 16 Oct 2005 09:34:35 -0000 1.5 @@ -107,6 +107,7 @@ 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); =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/evas/src/lib/engines/xrender_x11/evas_engine_ximage.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- evas_engine_ximage.c 9 Oct 2005 02:06:52 -0000 1.3 +++ evas_engine_ximage.c 16 Oct 2005 09:34:35 -0000 1.4 @@ -77,7 +77,7 @@ 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 @@ 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; |
From: <enl...@li...> - 2005-11-29 11:46:25
|
Enlightenment CVS committal Author : tsauerbeck Project : e17 Module : libs/evas Dir : e17/libs/evas/src/lib/engines/common Modified Files: evas_image_main.c Log Message: free image cache on shutdown =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/evas/src/lib/engines/common/evas_image_main.c,v retrieving revision 1.22 retrieving revision 1.23 diff -u -3 -r1.22 -r1.23 --- evas_image_main.c 29 Nov 2005 09:02:51 -0000 1.22 +++ evas_image_main.c 29 Nov 2005 11:46:20 -0000 1.23 @@ -312,6 +312,18 @@ } void +evas_common_image_free_cache(void) +{ + while (cache) + { + RGBA_Image *im = (RGBA_Image *) cache; + + evas_common_image_uncache(im); + evas_common_image_free(im); + } +} + +void evas_common_image_set_cache(int size) { cache_size = size; |
From: <enl...@li...> - 2005-11-29 11:46:28
|
Enlightenment CVS committal Author : tsauerbeck Project : e17 Module : libs/evas Dir : e17/libs/evas/src/lib/canvas Modified Files: evas_main.c Log Message: free image cache on shutdown =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/evas/src/lib/canvas/evas_main.c,v retrieving revision 1.23 retrieving revision 1.24 diff -u -3 -r1.23 -r1.24 --- evas_main.c 6 Nov 2005 09:47:27 -0000 1.23 +++ evas_main.c 29 Nov 2005 11:46:19 -0000 1.24 @@ -43,7 +43,10 @@ evas_shutdown(void) { if (--initcount == 0) + { evas_font_dir_cache_free(); + evas_common_image_free_cache(); + } return initcount; } |
From: <enl...@li...> - 2005-11-29 11:47:42
|
Enlightenment CVS committal Author : tsauerbeck Project : e17 Module : libs/evas Dir : e17/libs/evas/src/bin Modified Files: evas_software_x11_main.c Log Message: properly sht down evas etc, so evas_software_x11_test can be used to check for leaks. fixes need to be applied to the other engine tests as well =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/evas/src/bin/evas_software_x11_main.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -3 -r1.6 -r1.7 --- evas_software_x11_main.c 25 Jul 2005 09:55:47 -0000 1.6 +++ evas_software_x11_main.c 29 Nov 2005 11:47:25 -0000 1.7 @@ -50,6 +50,7 @@ XSync(disp, False); /* test evas_free.... :) */ + evas_init(); evas = evas_new(); evas_output_method_set(evas, evas_render_method_lookup("software_x11")); evas_output_size_set(evas, win_w, win_h); @@ -71,6 +72,7 @@ } setup(); printf("################ evas free\n"); + setdown(); evas_free(evas); printf("evas freed. DONE\n"); @@ -95,6 +97,7 @@ } setup(); printf("################ evas free\n"); + setdown(); evas_free(evas); printf("evas freed. DONE\n"); @@ -119,6 +122,7 @@ } setup(); printf("################ evas free\n"); + setdown(); evas_free(evas); printf("evas freed. DONE\n"); @@ -143,6 +147,7 @@ } setup(); printf("################ evas free\n"); + setdown(); evas_free(evas); printf("evas freed. DONE\n"); @@ -183,7 +188,13 @@ { case ButtonPress: if (ev.xbutton.button == 3) + { + setdown(); + evas_free(evas); + XCloseDisplay(disp); + evas_shutdown(); exit(0); + } #if 0 if (!pause_me) pause_me = 1; @@ -227,5 +238,11 @@ if (pause_me == 2) usleep(100000); } + + setdown(); + evas_free(evas); + XCloseDisplay(disp); + evas_shutdown(); + return 0; } |