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

eet: mega doc update, still stuff to do. 

* sync AUTHORS

 * add couple of groups, and change head.html to include "Modules"

 * Reorganize the Eet.h so header is better grouped and in an order
   that makes sense to the reader (as Eet.h gives the modules/group
   ordering).



SVN revision: 47327
This commit is contained in:
Gustavo Sverzut Barbieri 2010-03-18 20:16:56 +00:00
parent db38ac7b30
commit ea4e8a0abb
7 changed files with 1460 additions and 350 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
legacy/eet/AUTHORS
View File

@ -2,10 +2,10 @@ The Rasterman (Carsten Haitzler) <raster@rasterman.com>
David Goodlad <dgoodlad@gmail.com> David Goodlad <dgoodlad@gmail.com>
Cedric Bail <cedric.bail@free.fr> Cedric Bail <cedric.bail@free.fr>
Arnaud de Turckheim <quarium@gmail.com> Arnaud de Turckheim <quarium@gmail.com>
Luis Felipe Strano Moraes <luis.strano@gmail.com> Luis Felipe Strano Moraes <lfelipe@profusion.mobi>
Chidambar Zinnoury <illogict@online.fr> Chidambar Zinnoury <illogict@online.fr>
Vincent Torri <vtorri@univ-evry.fr> Vincent Torri <vtorri@univ-evry.fr>
Gustavo Sverzut Barbieri <barbieri@gmail.com> Gustavo Sverzut Barbieri <barbieri@profusion.mobi>
Raphael Kubo da Costa <kubo@profusion.mobi> Raphael Kubo da Costa <kubo@profusion.mobi>
Mathieu Taillefumier <mathieu.taillefumier@free.fr> Mathieu Taillefumier <mathieu.taillefumier@free.fr>
Albin "Lutin" Tonnerre <albin.tonnerre@gmail.com> Albin "Lutin" Tonnerre <albin.tonnerre@gmail.com>

6
legacy/eet/doc/Doxyfile
View File

@ -33,7 +33,7 @@ INLINE_INHERITED_MEMB = NO
FULL_PATH_NAMES = NO FULL_PATH_NAMES = NO
STRIP_FROM_PATH = STRIP_FROM_PATH =
INTERNAL_DOCS = NO INTERNAL_DOCS = NO
STRIP_CODE_COMMENTS = YES STRIP_CODE_COMMENTS = NO
CASE_SENSE_NAMES = YES CASE_SENSE_NAMES = YES
SHORT_NAMES = NO SHORT_NAMES = NO
HIDE_SCOPE_NAMES = NO HIDE_SCOPE_NAMES = NO
@ -46,7 +46,7 @@ INHERIT_DOCS = YES
INLINE_INFO = YES INLINE_INFO = YES
SORT_MEMBER_DOCS = YES SORT_MEMBER_DOCS = YES
DISTRIBUTE_GROUP_DOC = NO DISTRIBUTE_GROUP_DOC = NO
TAB_SIZE = 2 TAB_SIZE = 8
GENERATE_TODOLIST = YES GENERATE_TODOLIST = YES
GENERATE_TESTLIST = YES GENERATE_TESTLIST = YES
GENERATE_BUGLIST = YES GENERATE_BUGLIST = YES
@ -78,7 +78,7 @@ REFERENCED_BY_RELATION = YES
REFERENCES_RELATION = YES REFERENCES_RELATION = YES
ALPHABETICAL_INDEX = YES ALPHABETICAL_INDEX = YES
COLS_IN_ALPHA_INDEX = 2 COLS_IN_ALPHA_INDEX = 2
IGNORE_PREFIX = IGNORE_PREFIX = eet_ _eet_ Eet_ _Eet_ EET_ _EET_
GENERATE_TREEVIEW = NO GENERATE_TREEVIEW = NO
TREEVIEW_WIDTH = 250 TREEVIEW_WIDTH = 250
GENERATE_LATEX = YES GENERATE_LATEX = YES

15
legacy/eet/doc/eet.dox.in
View File

@ -12,8 +12,19 @@ These routines are used for Eet Library interaction
@image html e_big.png @image html e_big.png
@version @PACKAGE_VERSION@ @version @PACKAGE_VERSION@
@author Carsten Haitzler <raster\@rasterman.com> @author Carsten Haitzler <raster@@rasterman.com>
@date 2000-2008 @author David Goodlad <dgoodlad@@gmail.com>
@author Cedric Bail <cedric.bail@@free.fr>
@author Arnaud de Turckheim <quarium@@gmail.com>
@author Luis Felipe Strano Moraes <lfelipe@@profusion.mobi>
@author Chidambar Zinnoury <illogict@@online.fr>
@author Vincent Torri <vtorri@@univ-evry.fr>
@author Gustavo Sverzut Barbieri <barbieri@@profusion.mobi>
@author Raphael Kubo da Costa <kubo@@profusion.mobi>
@author Mathieu Taillefumier <mathieu.taillefumier@@free.fr>
@author Albin "Lutin" Tonnerre <albin.tonnerre@@gmail.com>
@author Adam Simpkins <adam@@adamsimpkins.net>
@date 2000-2010

2
legacy/eet/doc/head.html
View File

@ -48,7 +48,7 @@
<ul class="current"> <ul class="current">
<li><a href="todo.html">Todo</a></li> <li><a href="todo.html">Todo</a></li>
<li><a href="files.html">Files</a></li> <li><a href="files.html">Files</a></li>
<li><a href="Eet_8h.html">Header</a></li> <li><a href="modules.html">Modules</a></li>
<li><a href="globals.html">Globals</a></li> <li><a href="globals.html">Globals</a></li>
<li><a href="pages.html">Related Pages</a></li> <li><a href="pages.html">Related Pages</a></li>
<li class="current"><a href="index.html">Main Page</a></li> <li class="current"><a href="index.html">Main Page</a></li>

1659
legacy/eet/src/lib/Eet.h
View File

File diff suppressed because it is too large Load Diff

78
legacy/eet/src/lib/eet_data.c
View File

@ -1434,7 +1434,7 @@ eet_data_descriptor_element_add(Eet_Data_Descriptor *edd,
} }
EAPI void * EAPI void *
eet_data_read_cipher(Eet_File *ef, Eet_Data_Descriptor *edd, const char *name, const char *key) eet_data_read_cipher(Eet_File *ef, Eet_Data_Descriptor *edd, const char *name, const char *cipher_key)
{ {
const Eet_Dictionary *ed = NULL; const Eet_Dictionary *ed = NULL;
const void *data = NULL; const void *data = NULL;
@ -1445,12 +1445,12 @@ eet_data_read_cipher(Eet_File *ef, Eet_Data_Descriptor *edd, const char *name, c
ed = eet_dictionary_get(ef); ed = eet_dictionary_get(ef);
if (!key) if (!cipher_key)
data = eet_read_direct(ef, name, &size); data = eet_read_direct(ef, name, &size);
if (!data) if (!data)
{ {
required_free = 1; required_free = 1;
data = eet_read_cipher(ef, name, &size, key); data = eet_read_cipher(ef, name, &size, cipher_key);
if (!data) return NULL; if (!data) return NULL;
} }
@ -1463,7 +1463,7 @@ eet_data_read_cipher(Eet_File *ef, Eet_Data_Descriptor *edd, const char *name, c
} }
EAPI Eet_Node * EAPI Eet_Node *
eet_data_node_read_cipher(Eet_File *ef, const char *name, const char *key) eet_data_node_read_cipher(Eet_File *ef, const char *name, const char *cipher_key)
{ {
const Eet_Dictionary *ed = NULL; const Eet_Dictionary *ed = NULL;
const void *data = NULL; const void *data = NULL;
@ -1474,12 +1474,12 @@ eet_data_node_read_cipher(Eet_File *ef, const char *name, const char *key)
ed = eet_dictionary_get(ef); ed = eet_dictionary_get(ef);
if (!key) if (!cipher_key)
data = eet_read_direct(ef, name, &size); data = eet_read_direct(ef, name, &size);
if (!data) if (!data)
{ {
required_free = 1; required_free = 1;
data = eet_read_cipher(ef, name, &size, key); data = eet_read_cipher(ef, name, &size, cipher_key);
if (!data) return NULL; if (!data) return NULL;
} }
@ -1498,7 +1498,7 @@ eet_data_read(Eet_File *ef, Eet_Data_Descriptor *edd, const char *name)
} }
EAPI int EAPI int
eet_data_write_cipher(Eet_File *ef, Eet_Data_Descriptor *edd, const char *name, const char *key, const void *data, int compress) eet_data_write_cipher(Eet_File *ef, Eet_Data_Descriptor *edd, const char *name, const char *cipher_key, const void *data, int compress)
{ {
Eet_Dictionary *ed; Eet_Dictionary *ed;
void *data_enc; void *data_enc;
@ -1509,7 +1509,7 @@ eet_data_write_cipher(Eet_File *ef, Eet_Data_Descriptor *edd, const char *name,
data_enc = _eet_data_descriptor_encode(ed, edd, data, &size); data_enc = _eet_data_descriptor_encode(ed, edd, data, &size);
if (!data_enc) return 0; if (!data_enc) return 0;
val = eet_write_cipher(ef, name, data_enc, size, compress, key); val = eet_write_cipher(ef, name, data_enc, size, compress, cipher_key);
free(data_enc); free(data_enc);
return val; return val;
} }
@ -1724,7 +1724,7 @@ _eet_freelist_all_unref(Eet_Free_Context *freelist_context)
} }
static int static int
eet_data_descriptor_encode_hash_cb(void *hash __UNUSED__, const char *key, void *hdata, void *fdata) eet_data_descriptor_encode_hash_cb(void *hash __UNUSED__, const char *cipher_key, void *hdata, void *fdata)
{ {
Eet_Dictionary *ed; Eet_Dictionary *ed;
Eet_Data_Encode_Hash_Info *edehi; Eet_Data_Encode_Hash_Info *edehi;
@ -1742,7 +1742,7 @@ eet_data_descriptor_encode_hash_cb(void *hash __UNUSED__, const char *key, void
/* Store key */ /* Store key */
data = eet_data_put_type(ed, data = eet_data_put_type(ed,
EET_T_STRING, EET_T_STRING,
&key, &cipher_key,
&size); &size);
if (data) if (data)
{ {
@ -3038,7 +3038,7 @@ eet_data_put_hash(Eet_Dictionary *ed, Eet_Data_Descriptor *edd, Eet_Data_Element
EAPI int EAPI int
eet_data_dump_cipher(Eet_File *ef, eet_data_dump_cipher(Eet_File *ef,
const char *name, const char *key, const char *name, const char *cipher_key,
void (*dumpfunc) (void *data, const char *str), void (*dumpfunc) (void *data, const char *str),
void *dumpdata) void *dumpdata)
{ {
@ -3051,12 +3051,12 @@ eet_data_dump_cipher(Eet_File *ef,
ed = eet_dictionary_get(ef); ed = eet_dictionary_get(ef);
if (!key) if (!cipher_key)
data = eet_read_direct(ef, name, &size); data = eet_read_direct(ef, name, &size);
if (!data) if (!data)
{ {
required_free = 1; required_free = 1;
data = eet_read_cipher(ef, name, &size, key); data = eet_read_cipher(ef, name, &size, cipher_key);
if (!data) return 0; if (!data) return 0;
} }
@ -3085,7 +3085,7 @@ eet_data_dump(Eet_File *ef,
EAPI int EAPI int
eet_data_text_dump_cipher(const void *data_in, eet_data_text_dump_cipher(const void *data_in,
const char *key, int size_in, const char *cipher_key, int size_in,
void (*dumpfunc) (void *data, const char *str), void (*dumpfunc) (void *data, const char *str),
void *dumpdata) void *dumpdata)
{ {
@ -3096,9 +3096,10 @@ eet_data_text_dump_cipher(const void *data_in,
if (!data_in) return 0; if (!data_in) return 0;
if (key) if (cipher_key)
{ {
if (eet_decipher(data_in, size_in, key, strlen(key), &ret, &ret_len)) if (eet_decipher(data_in, size_in, cipher_key,
strlen(cipher_key), &ret, &ret_len))
{ {
if (ret) free(ret); if (ret) free(ret);
return 0; return 0;
@ -3116,7 +3117,7 @@ eet_data_text_dump_cipher(const void *data_in,
eet_node_dump(result, 0, dumpfunc, dumpdata); eet_node_dump(result, 0, dumpfunc, dumpdata);
eet_node_del(result); eet_node_del(result);
if (key) free(ret); if (cipher_key) free(ret);
return result ? 1 : 0; return result ? 1 : 0;
} }
@ -3132,19 +3133,20 @@ eet_data_text_dump(const void *data_in,
EAPI void * EAPI void *
eet_data_text_undump_cipher(const char *text, eet_data_text_undump_cipher(const char *text,
const char *key, const char *cipher_key,
int textlen, int textlen,
int *size_ret) int *size_ret)
{ {
void *ret = NULL; void *ret = NULL;
ret = _eet_data_dump_parse(NULL, size_ret, text, textlen); ret = _eet_data_dump_parse(NULL, size_ret, text, textlen);
if (ret && key) if (ret && cipher_key)
{ {
void *ciphered = NULL; void *ciphered = NULL;
unsigned int ciphered_len; unsigned int ciphered_len;
if (eet_cipher(ret, *size_ret, key, strlen(key), &ciphered, &ciphered_len)) if (eet_cipher(ret, *size_ret, cipher_key,
strlen(cipher_key), &ciphered, &ciphered_len))
{ {
if (ciphered) free(ciphered); if (ciphered) free(ciphered);
size_ret = 0; size_ret = 0;
@ -3169,7 +3171,7 @@ eet_data_text_undump(const char *text,
EAPI int EAPI int
eet_data_undump_cipher(Eet_File *ef, eet_data_undump_cipher(Eet_File *ef,
const char *name, const char *name,
const char *key, const char *cipher_key,
const char *text, const char *text,
int textlen, int textlen,
int compress) int compress)
@ -3183,7 +3185,7 @@ eet_data_undump_cipher(Eet_File *ef,
data_enc = _eet_data_dump_parse(ed, &size, text, textlen); data_enc = _eet_data_dump_parse(ed, &size, text, textlen);
if (!data_enc) return 0; if (!data_enc) return 0;
val = eet_write_cipher(ef, name, data_enc, size, compress, key); val = eet_write_cipher(ef, name, data_enc, size, compress, cipher_key);
free(data_enc); free(data_enc);
return val; return val;
} }
@ -3201,7 +3203,7 @@ eet_data_undump(Eet_File *ef,
EAPI void * EAPI void *
eet_data_descriptor_decode_cipher(Eet_Data_Descriptor *edd, eet_data_descriptor_decode_cipher(Eet_Data_Descriptor *edd,
const void *data_in, const void *data_in,
const char *key, const char *cipher_key,
int size_in) int size_in)
{ {
void *deciphered = (void*) data_in; void *deciphered = (void*) data_in;
@ -3209,9 +3211,10 @@ eet_data_descriptor_decode_cipher(Eet_Data_Descriptor *edd,
Eet_Free_Context context; Eet_Free_Context context;
unsigned int deciphered_len = size_in; unsigned int deciphered_len = size_in;
if (key && data_in) if (cipher_key && data_in)
{ {
if (eet_decipher(data_in, size_in, key, strlen(key), &deciphered, &deciphered_len)) if (eet_decipher(data_in, size_in, cipher_key,
strlen(cipher_key), &deciphered, &deciphered_len))
{ {
if (deciphered) free(deciphered); if (deciphered) free(deciphered);
return NULL; return NULL;
@ -3235,16 +3238,17 @@ eet_data_descriptor_decode(Eet_Data_Descriptor *edd,
} }
EAPI void * EAPI void *
eet_data_node_decode_cipher(const void *data_in, const char *key, int size_in) eet_data_node_decode_cipher(const void *data_in, const char *cipher_key, int size_in)
{ {
void *deciphered = (void*) data_in; void *deciphered = (void*) data_in;
Eet_Node *ret; Eet_Node *ret;
Eet_Free_Context context; Eet_Free_Context context;
unsigned int deciphered_len = size_in; unsigned int deciphered_len = size_in;
if (key && data_in) if (cipher_key && data_in)
{ {
if (eet_decipher(data_in, size_in, key, strlen(key), &deciphered, &deciphered_len)) if (eet_decipher(data_in, size_in, cipher_key,
strlen(cipher_key), &deciphered, &deciphered_len))
{ {
if (deciphered) free(deciphered); if (deciphered) free(deciphered);
return NULL; return NULL;
@ -3310,7 +3314,7 @@ _eet_data_descriptor_encode(Eet_Dictionary *ed,
} }
EAPI int EAPI int
eet_data_node_write_cipher(Eet_File *ef, const char *name, const char *key, Eet_Node *node, int compress) eet_data_node_write_cipher(Eet_File *ef, const char *name, const char *cipher_key, Eet_Node *node, int compress)
{ {
Eet_Dictionary *ed; Eet_Dictionary *ed;
void *data_enc; void *data_enc;
@ -3321,14 +3325,14 @@ eet_data_node_write_cipher(Eet_File *ef, const char *name, const char *key, Eet_
data_enc = _eet_data_dump_encode(EET_G_UNKNOWN, ed, node, &size); data_enc = _eet_data_dump_encode(EET_G_UNKNOWN, ed, node, &size);
if (!data_enc) return 0; if (!data_enc) return 0;
val = eet_write_cipher(ef, name, data_enc, size, compress, key); val = eet_write_cipher(ef, name, data_enc, size, compress, cipher_key);
free(data_enc); free(data_enc);
return val; return val;
} }
EAPI void * EAPI void *
eet_data_node_encode_cipher(Eet_Node *node, eet_data_node_encode_cipher(Eet_Node *node,
const char *key, const char *cipher_key,
int *size_ret) int *size_ret)
{ {
void *ret = NULL; void *ret = NULL;
@ -3337,9 +3341,10 @@ eet_data_node_encode_cipher(Eet_Node *node,
int size; int size;
ret = _eet_data_dump_encode(EET_G_UNKNOWN, NULL, node, &size); ret = _eet_data_dump_encode(EET_G_UNKNOWN, NULL, node, &size);
if (key && ret) if (cipher_key && ret)
{ {
if (eet_cipher(ret, size, key, strlen(key), &ciphered, &ciphered_len)) if (eet_cipher(ret, size, cipher_key,
strlen(cipher_key), &ciphered, &ciphered_len))
{ {
if (ciphered) free(ciphered); if (ciphered) free(ciphered);
if (size_ret) *size_ret = 0; if (size_ret) *size_ret = 0;
@ -3358,7 +3363,7 @@ eet_data_node_encode_cipher(Eet_Node *node,
EAPI void * EAPI void *
eet_data_descriptor_encode_cipher(Eet_Data_Descriptor *edd, eet_data_descriptor_encode_cipher(Eet_Data_Descriptor *edd,
const void *data_in, const void *data_in,
const char *key, const char *cipher_key,
int *size_ret) int *size_ret)
{ {
void *ret = NULL; void *ret = NULL;
@ -3367,9 +3372,10 @@ eet_data_descriptor_encode_cipher(Eet_Data_Descriptor *edd,
int size; int size;
ret = _eet_data_descriptor_encode(NULL, edd, data_in, &size); ret = _eet_data_descriptor_encode(NULL, edd, data_in, &size);
if (key && ret) if (cipher_key && ret)
{ {
if (eet_cipher(ret, size, key, strlen(key), &ciphered, &ciphered_len)) if (eet_cipher(ret, size, cipher_key,
strlen(cipher_key), &ciphered, &ciphered_len))
{ {
if (ciphered) free(ciphered); if (ciphered) free(ciphered);
if (size_ret) *size_ret = 0; if (size_ret) *size_ret = 0;

46
legacy/eet/src/lib/eet_image.c
View File

@ -909,7 +909,7 @@ eet_data_image_jpeg_alpha_convert(int *size, const void *data, unsigned int w, u
} }
EAPI int EAPI int
eet_data_image_write_cipher(Eet_File *ef, const char *name, const char *key, eet_data_image_write_cipher(Eet_File *ef, const char *name, const char *cipher_key,
const void *data, unsigned int w, unsigned int h, int alpha, const void *data, unsigned int w, unsigned int h, int alpha,
int comp, int quality, int lossy) int comp, int quality, int lossy)
{ {
@ -921,7 +921,7 @@ eet_data_image_write_cipher(Eet_File *ef, const char *name, const char *key,
{ {
int v; int v;
v = eet_write_cipher(ef, name, d, size, 0, key); v = eet_write_cipher(ef, name, d, size, 0, cipher_key);
free(d); free(d);
return v; return v;
} }
@ -938,7 +938,7 @@ eet_data_image_write(Eet_File *ef, const char *name,
EAPI void * EAPI void *
eet_data_image_read_cipher(Eet_File *ef, const char *name, const char *key, eet_data_image_read_cipher(Eet_File *ef, const char *name, const char *cipher_key,
unsigned int *w, unsigned int *h, int *alpha, unsigned int *w, unsigned int *h, int *alpha,
int *comp, int *quality, int *lossy) int *comp, int *quality, int *lossy)
{ {
@ -947,11 +947,11 @@ eet_data_image_read_cipher(Eet_File *ef, const char *name, const char *key,
int free_data = 0; int free_data = 0;
int size; int size;
if (!key) if (!cipher_key)
data = (void *)eet_read_direct(ef, name, &size); data = (void *)eet_read_direct(ef, name, &size);
if (!data) if (!data)
{ {
data = eet_read_cipher(ef, name, &size, key); data = eet_read_cipher(ef, name, &size, cipher_key);
free_data = 1; free_data = 1;
if (!data) return NULL; if (!data) return NULL;
} }
@ -973,7 +973,7 @@ eet_data_image_read(Eet_File *ef, const char *name,
} }
EAPI int EAPI int
eet_data_image_read_to_surface_cipher(Eet_File *ef, const char *name, const char *key, unsigned int src_x, unsigned int src_y, eet_data_image_read_to_surface_cipher(Eet_File *ef, const char *name, const char *cipher_key, unsigned int src_x, unsigned int src_y,
unsigned int *d, unsigned int w, unsigned int h, unsigned int row_stride, unsigned int *d, unsigned int w, unsigned int h, unsigned int row_stride,
int *alpha, int *comp, int *quality, int *lossy) int *alpha, int *comp, int *quality, int *lossy)
{ {
@ -982,11 +982,11 @@ eet_data_image_read_to_surface_cipher(Eet_File *ef, const char *name, const char
int res = 1; int res = 1;
int size; int size;
if (!key) if (!cipher_key)
data = (void *)eet_read_direct(ef, name, &size); data = (void *)eet_read_direct(ef, name, &size);
if (!data) if (!data)
{ {
data = eet_read_cipher(ef, name, &size, key); data = eet_read_cipher(ef, name, &size, cipher_key);
free_data = 1; free_data = 1;
if (!data) return 0; if (!data) return 0;
} }
@ -1008,7 +1008,7 @@ eet_data_image_read_to_surface(Eet_File *ef, const char *name, unsigned int src_
} }
EAPI int EAPI int
eet_data_image_header_read_cipher(Eet_File *ef, const char *name, const char *key, eet_data_image_header_read_cipher(Eet_File *ef, const char *name, const char *cipher_key,
unsigned int *w, unsigned int *h, int *alpha, unsigned int *w, unsigned int *h, int *alpha,
int *comp, int *quality, int *lossy) int *comp, int *quality, int *lossy)
{ {
@ -1017,11 +1017,11 @@ eet_data_image_header_read_cipher(Eet_File *ef, const char *name, const char *ke
int free_data = 0; int free_data = 0;
int d; int d;
if (!key) if (!cipher_key)
data = (void *)eet_read_direct(ef, name, &size); data = (void *)eet_read_direct(ef, name, &size);
if (!data) if (!data)
{ {
data = eet_read_cipher(ef, name, &size, key); data = eet_read_cipher(ef, name, &size, cipher_key);
free_data = 1; free_data = 1;
if (!data) return 0; if (!data) return 0;
} }
@ -1043,7 +1043,7 @@ eet_data_image_header_read(Eet_File *ef, const char *name,
EAPI void * EAPI void *
eet_data_image_encode_cipher(const void *data, const char *key, unsigned int w, unsigned int h, int alpha, int comp, int quality, int lossy, int *size_ret) eet_data_image_encode_cipher(const void *data, const char *cipher_key, unsigned int w, unsigned int h, int alpha, int comp, int quality, int lossy, int *size_ret)
{ {
void *d = NULL; void *d = NULL;
void *ciphered_d = NULL; void *ciphered_d = NULL;
@ -1067,9 +1067,9 @@ eet_data_image_encode_cipher(const void *data, const char *key, unsigned int w,
else else
d = eet_data_image_jpeg_alpha_convert(&size, data, w, h, alpha, quality); d = eet_data_image_jpeg_alpha_convert(&size, data, w, h, alpha, quality);
} }
if (key) if (cipher_key)
{ {
if(!eet_cipher(d, size, key, strlen(key), &ciphered_d, &ciphered_sz)) if(!eet_cipher(d, size, cipher_key, strlen(cipher_key), &ciphered_d, &ciphered_sz))
{ {
if (d) free(d); if (d) free(d);
d = ciphered_d; d = ciphered_d;
@ -1090,15 +1090,15 @@ eet_data_image_encode(const void *data, int *size_ret, unsigned int w, unsigned
} }
EAPI int EAPI int
eet_data_image_header_decode_cipher(const void *data, const char *key, int size, unsigned int *w, unsigned int *h, int *alpha, int *comp, int *quality, int *lossy) eet_data_image_header_decode_cipher(const void *data, const char *cipher_key, int size, unsigned int *w, unsigned int *h, int *alpha, int *comp, int *quality, int *lossy)
{ {
int header[8]; int header[8];
void *deciphered_d = NULL; void *deciphered_d = NULL;
unsigned int deciphered_sz = 0; unsigned int deciphered_sz = 0;
if (key) if (cipher_key)
{ {
if (!eet_decipher(data, size, key, strlen(key), &deciphered_d, &deciphered_sz)) if (!eet_decipher(data, size, cipher_key, strlen(cipher_key), &deciphered_d, &deciphered_sz))
{ {
data = deciphered_d; data = deciphered_d;
size = deciphered_sz; size = deciphered_sz;
@ -1306,7 +1306,7 @@ _eet_data_image_decode_inside(const void *data, int size, unsigned int src_x, un
} }
EAPI void * EAPI void *
eet_data_image_decode_cipher(const void *data, const char *key, int size, unsigned int *w, unsigned int *h, int *alpha, int *comp, int *quality, int *lossy) eet_data_image_decode_cipher(const void *data, const char *cipher_key, int size, unsigned int *w, unsigned int *h, int *alpha, int *comp, int *quality, int *lossy)
{ {
unsigned int *d = NULL; unsigned int *d = NULL;
unsigned int iw, ih; unsigned int iw, ih;
@ -1314,9 +1314,9 @@ eet_data_image_decode_cipher(const void *data, const char *key, int size, unsign
void *deciphered_d = NULL; void *deciphered_d = NULL;
unsigned int deciphered_sz = 0; unsigned int deciphered_sz = 0;
if (key) if (cipher_key)
{ {
if (!eet_decipher(data, size, key, strlen(key), &deciphered_d, &deciphered_sz)) if (!eet_decipher(data, size, cipher_key, strlen(cipher_key), &deciphered_d, &deciphered_sz))
{ {
data = deciphered_d; data = deciphered_d;
size = deciphered_sz; size = deciphered_sz;
@ -1355,7 +1355,7 @@ eet_data_image_decode(const void *data, int size, unsigned int *w, unsigned int
} }
EAPI int EAPI int
eet_data_image_decode_to_surface_cipher(const void *data, const char *key, int size, unsigned int src_x, unsigned int src_y, eet_data_image_decode_to_surface_cipher(const void *data, const char *cipher_key, int size, unsigned int src_x, unsigned int src_y,
unsigned int *d, unsigned int w, unsigned int h, unsigned int row_stride, unsigned int *d, unsigned int w, unsigned int h, unsigned int row_stride,
int *alpha, int *comp, int *quality, int *lossy) int *alpha, int *comp, int *quality, int *lossy)
{ {
@ -1364,9 +1364,9 @@ eet_data_image_decode_to_surface_cipher(const void *data, const char *key, int s
void *deciphered_d = NULL; void *deciphered_d = NULL;
unsigned int deciphered_sz = 0; unsigned int deciphered_sz = 0;
if (key) if (cipher_key)
{ {
if (!eet_decipher(data, size, key, strlen(key), &deciphered_d, &deciphered_sz)) if (!eet_decipher(data, size, cipher_key, strlen(cipher_key), &deciphered_d, &deciphered_sz))
{ {
data = deciphered_d; data = deciphered_d;
size = deciphered_sz; size = deciphered_sz;