bu5hm4n
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

useless data files removed... making room for improvements in the engine. 

chnaged some images. need to update evas_*_test at some point to not be ugly
and be able to test everything.


SVN revision: 13101
This commit is contained in:
Carsten Haitzler 2005-01-26 07:49:57 +00:00
parent c48ae2731f
commit f39f6f9840
19 changed files with 38 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
legacy/evas/data/Makefile.am
View File

@ -1,7 +1,7 @@
FILES = Vera.ttf VeraBI.ttf VeraBd.ttf VeraIt.ttf VeraMoBI.ttf VeraMoBd.ttf \ FILES = Vera.ttf VeraBI.ttf VeraBd.ttf VeraIt.ttf VeraMoBI.ttf VeraMoBd.ttf \
VeraMoIt.ttf VeraMono.ttf VeraSe.ttf VeraSeBd.ttf fonts.alias fonts.dir \ VeraMoIt.ttf VeraMono.ttf VeraSe.ttf VeraSeBd.ttf fonts.alias fonts.dir \
backdrop.png bg.png e_logo.png evas_logo.png panel.png \ backdrop.png e_logo.png evas_logo.png panel.png \
panel_shadow.png panel_top.png sphere.png sphere_shadow.png \ panel_shadow.png panel_top.png \
t1.png t2.png test_pattern.png t1.png t2.png test_pattern.png
miscdir = $(pkgdatadir)/data miscdir = $(pkgdatadir)/data

BIN
legacy/evas/data/backdrop.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.6 KiB

After

Width:  |  Height:  |  Size: 78 KiB

BIN
legacy/evas/data/bg.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 463 KiB

BIN
legacy/evas/data/sphere.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.0 KiB

BIN
legacy/evas/data/sphere_shadow.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.3 KiB

BIN
legacy/evas/data/t1.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1002 B

After

Width:  |  Height:  |  Size: 4.5 KiB

BIN
legacy/evas/data/t2.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 4.0 KiB

2
legacy/evas/src/lib/engines/buffer/evas_engine.c
View File

@ -671,7 +671,7 @@ evas_engine_buffer_image_new_from_data(void *data, int w, int h, DATA32 *image_d
re = (Render_Engine *)data; re = (Render_Engine *)data;
im = evas_common_image_new(); im = evas_common_image_new();
im->image = evas_common_image_surface_new(); im->image = evas_common_image_surface_new(im);
if (!im->image) if (!im->image)
{ {
evas_common_image_free(im); evas_common_image_free(im);

2
legacy/evas/src/lib/engines/buffer/evas_outbuf.c
View File

@ -46,7 +46,7 @@ evas_buffer_outbuf_buf_setup_fb(int w, int h, Outbuf_Depth depth, void *dest, in
(buf->dest) && (buf->dest_row_bytes == (buf->w * sizeof(DATA32)))) (buf->dest) && (buf->dest_row_bytes == (buf->w * sizeof(DATA32))))
{ {
buf->priv.back_buf = evas_common_image_new(); buf->priv.back_buf = evas_common_image_new();
buf->priv.back_buf->image = evas_common_image_surface_new(); buf->priv.back_buf->image = evas_common_image_surface_new( buf->priv.back_buf);
buf->priv.back_buf->image->w = w; buf->priv.back_buf->image->w = w;
buf->priv.back_buf->image->h = h; buf->priv.back_buf->image->h = h;
buf->priv.back_buf->image->data = buf->dest; buf->priv.back_buf->image->data = buf->dest;

12
legacy/evas/src/lib/engines/common/evas_image_load.c
View File

@ -83,7 +83,7 @@ load_image_file_head_png(RGBA_Image *im, const char *file, const char *key)
(png_uint_32 *) (&h32), &bit_depth, &color_type, (png_uint_32 *) (&h32), &bit_depth, &color_type,
&interlace_type, NULL, NULL); &interlace_type, NULL, NULL);
if (!im->image) if (!im->image)
im->image = evas_common_image_surface_new(); im->image = evas_common_image_surface_new(im);
if (!im->image) if (!im->image)
{ {
png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp) NULL); png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp) NULL);
@ -299,7 +299,7 @@ load_image_file_head_jpeg_internal(RGBA_Image *im, FILE *f)
/* head decoding */ /* head decoding */
if (!im->image) if (!im->image)
im->image = evas_common_image_surface_new(); im->image = evas_common_image_surface_new(im);
if (!im->image) if (!im->image)
{ {
jpeg_destroy_decompress(&cinfo); jpeg_destroy_decompress(&cinfo);
@ -586,7 +586,7 @@ load_image_file_head_eet(RGBA_Image *im, const char *file, const char *key)
} }
if (alpha) im->flags |= RGBA_IMAGE_HAS_ALPHA; if (alpha) im->flags |= RGBA_IMAGE_HAS_ALPHA;
if (!im->image) if (!im->image)
im->image = evas_common_image_surface_new(); im->image = evas_common_image_surface_new(im);
if (!im->image) if (!im->image)
{ {
free(body); free(body);
@ -626,7 +626,7 @@ load_image_file_data_eet(RGBA_Image *im, const char *file, const char *key)
} }
if (alpha) im->flags |= RGBA_IMAGE_HAS_ALPHA; if (alpha) im->flags |= RGBA_IMAGE_HAS_ALPHA;
if (!im->image) if (!im->image)
im->image = evas_common_image_surface_new(); im->image = evas_common_image_surface_new(im);
if (!im->image) if (!im->image)
{ {
eet_close(ef); eet_close(ef);
@ -696,7 +696,7 @@ load_image_file_head_edb(RGBA_Image *im, const char *file, const char *key)
} }
if (alpha) im->flags |= RGBA_IMAGE_HAS_ALPHA; if (alpha) im->flags |= RGBA_IMAGE_HAS_ALPHA;
if (!im->image) if (!im->image)
im->image = evas_common_image_surface_new(); im->image = evas_common_image_surface_new(im);
if (!im->image) if (!im->image)
{ {
free(ret); free(ret);
@ -767,7 +767,7 @@ load_image_file_data_edb(RGBA_Image *im, const char *file, const char *key)
} }
if (alpha) im->flags |= RGBA_IMAGE_HAS_ALPHA; if (alpha) im->flags |= RGBA_IMAGE_HAS_ALPHA;
if (!im->image) if (!im->image)
im->image = evas_common_image_surface_new(); im->image = evas_common_image_surface_new(im);
if (!im->image) if (!im->image)
{ {
free(ret); free(ret);

13
legacy/evas/src/lib/engines/common/evas_image_main.c
View File

@ -77,11 +77,12 @@ evas_common_image_shutdown(void)
} }
RGBA_Surface * RGBA_Surface *
evas_common_image_surface_new(void) evas_common_image_surface_new(RGBA_Image *im)
{ {
RGBA_Surface *is; RGBA_Surface *is;
is = calloc(1, sizeof(RGBA_Surface)); is = calloc(1, sizeof(RGBA_Surface));
is->im = im;
return is; return is;
} }
@ -95,7 +96,7 @@ evas_common_image_surface_free(RGBA_Surface *is)
void void
evas_common_image_surface_alloc(RGBA_Surface *is) evas_common_image_surface_alloc(RGBA_Surface *is)
{ {
size_t siz = is->w * is->h * sizeof(DATA32); size_t siz = 0;
static int on_valgrind; static int on_valgrind;
/* init data when we're under Valgrind's control */ /* init data when we're under Valgrind's control */
@ -108,7 +109,11 @@ evas_common_image_surface_alloc(RGBA_Surface *is)
init = 1; init = 1;
} }
#endif #endif
if (is->im->flags & RGBA_IMAGE_ALPHA_ONLY)
siz = is->w * is->h * sizeof(DATA8);
else
siz = is->w * is->h * sizeof(DATA32);
is->data = on_valgrind ? calloc(1, siz) : malloc(siz); is->data = on_valgrind ? calloc(1, siz) : malloc(siz);
} }
@ -129,7 +134,7 @@ evas_common_image_create(int w, int h)
im = evas_common_image_new(); im = evas_common_image_new();
if (!im) return NULL; if (!im) return NULL;
im->image = evas_common_image_surface_new(); im->image = evas_common_image_surface_new(im);
if (!im->image) if (!im->image)
{ {
evas_common_image_free(im); evas_common_image_free(im);

2
legacy/evas/src/lib/engines/directfb/evas_engine_dfb.c
View File

@ -182,7 +182,7 @@ evas_engine_directfb_output_setup(int w, int h, IDirectFB * dfb,
* manipulated directly. */ * manipulated directly. */
im = evas_common_image_new(); im = evas_common_image_new();
if (!im) return; if (!im) return;
im->image = evas_common_image_surface_new(); im->image = evas_common_image_surface_new(im);
if (!im->image) if (!im->image)
{ {
evas_common_image_free(im); evas_common_image_free(im);

4
legacy/evas/src/lib/engines/directfb/evas_engine_dfb_image_objects.c
View File

@ -71,7 +71,7 @@ evas_engine_directfb_image_load(void *data, char *file, char *key, int *error)
provider->Release(provider); provider->Release(provider);
im = evas_common_image_new(); im = evas_common_image_new();
im->image = evas_common_image_surface_new(); im->image = evas_common_image_surface_new(im);
if (!im->image) if (!im->image)
{ {
image->Release(image); image->Release(image);
@ -556,7 +556,7 @@ _dfb_image_create(Render_Engine *re, int w, int h)
im = evas_common_image_new(); im = evas_common_image_new();
if (!im) return NULL; if (!im) return NULL;
im->image = evas_common_image_surface_new(); im->image = evas_common_image_surface_new(im);
if (!im->image) if (!im->image)
{ {
_dfb_image_free(im); _dfb_image_free(im);

2
legacy/evas/src/lib/engines/fb/evas_engine.c
View File

@ -587,7 +587,7 @@ evas_engine_fb_image_new_from_data(void *data, int w, int h, DATA32 *image_data)
re = (Render_Engine *)data; re = (Render_Engine *)data;
im = evas_common_image_new(); im = evas_common_image_new();
im->image = evas_common_image_surface_new(); im->image = evas_common_image_surface_new(im);
if (!im->image) if (!im->image)
{ {
evas_common_image_free(im); evas_common_image_free(im);

2
legacy/evas/src/lib/engines/gl_common/evas_gl_image.c
View File

@ -66,7 +66,7 @@ evas_gl_common_image_new_from_data(Evas_GL_Context *gc, int w, int h, int *data)
free(im); free(im);
return NULL; return NULL;
} }
im->im->image = evas_common_image_surface_new(); im->im->image = evas_common_image_surface_new(im->im);
if (!im->im->image) if (!im->im->image)
{ {
evas_common_image_free(im->im); evas_common_image_free(im->im);

2
legacy/evas/src/lib/engines/gl_x11/evas_engine.c
View File

@ -986,7 +986,7 @@ evas_engine_gl_x11_font_draw(void *data, void *context, void *surface, void *fon
if (!im) if (!im)
{ {
im = evas_common_image_new(); im = evas_common_image_new();
im->image = evas_common_image_surface_new(); im->image = evas_common_image_surface_new(im);
im->image->no_free = 1; im->image->no_free = 1;
} }
im->image->w = re->win->w; im->image->w = re->win->w;

2
legacy/evas/src/lib/engines/software_qtopia/evas_engine.c
View File

@ -610,7 +610,7 @@ evas_engine_software_qtopia_image_new_from_data(void *data, int w, int h, DATA32
re = (Render_Engine *)data; re = (Render_Engine *)data;
im = evas_common_image_new(); im = evas_common_image_new();
im->image = evas_common_image_surface_new(); im->image = evas_common_image_surface_new(im);
if (!im->image) if (!im->image)
{ {
evas_common_image_free(im); evas_common_image_free(im);

2
legacy/evas/src/lib/engines/software_x11/evas_engine.c
View File

@ -666,7 +666,7 @@ evas_engine_software_x11_image_new_from_data(void *data, int w, int h, DATA32 *i
re = (Render_Engine *)data; re = (Render_Engine *)data;
im = evas_common_image_new(); im = evas_common_image_new();
im->image = evas_common_image_surface_new(); im->image = evas_common_image_surface_new(im);
if (!im->image) if (!im->image)
{ {
evas_common_image_free(im); evas_common_image_free(im);

19
legacy/evas/src/lib/include/evas_common.h
View File

@ -188,10 +188,12 @@ typedef void (*Gfx_Func_Convert) (DATA32 *src, DATA8 *dst, int src_jump, int dst
typedef enum _RGBA_Image_Flags typedef enum _RGBA_Image_Flags
{ {
RGBA_IMAGE_NOTHING = (0), RGBA_IMAGE_NOTHING = (0),
RGBA_IMAGE_HAS_ALPHA = (1 << 0), RGBA_IMAGE_HAS_ALPHA = (1 << 0),
RGBA_IMAGE_IS_DIRTY = (1 << 1), RGBA_IMAGE_IS_DIRTY = (1 << 1),
RGBA_IMAGE_INDEXED = (1 << 2) RGBA_IMAGE_INDEXED = (1 << 2),
RGBA_IMAGE_ALPHA_ONLY = (1 << 3),
RGBA_IMAGE_HAVE_SPANS = (1 << 4)
} RGBA_Image_Flags; } RGBA_Image_Flags;
typedef enum _Convert_Pal_Mode typedef enum _Convert_Pal_Mode
@ -284,9 +286,10 @@ struct _RGBA_Draw_Context
struct _RGBA_Surface struct _RGBA_Surface
{ {
int w, h; int w, h;
DATA32 *data; DATA32 *data;
char no_free : 1; char no_free : 1;
RGBA_Image *im;
}; };
struct _RGBA_Image struct _RGBA_Image
@ -758,7 +761,7 @@ void evas_common_scale_rgba_in_to_out_clip_sample (RGBA_Image *src, RGBA_Im
void evas_common_image_init (void); void evas_common_image_init (void);
void evas_common_image_shutdown (void); void evas_common_image_shutdown (void);
RGBA_Surface *evas_common_image_surface_new (void); RGBA_Surface *evas_common_image_surface_new (RGBA_Image *im);
void evas_common_image_surface_free (RGBA_Surface *is); void evas_common_image_surface_free (RGBA_Surface *is);
void evas_common_image_surface_alloc (RGBA_Surface *is); void evas_common_image_surface_alloc (RGBA_Surface *is);
void evas_common_image_surface_dealloc (RGBA_Surface *is); void evas_common_image_surface_dealloc (RGBA_Surface *is);