summaryrefslogtreecommitdiff
path: root/src/lib/evas/cserve2/evas_cs2.h
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2013-08-07 18:48:00 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2013-10-28 15:47:14 +0900
commit7ebda2d123ec53bad84dc7eabc08530477d50e80 (patch)
tree0cf81fd9471e37e7c6dcc48560247ea9a57449ef /src/lib/evas/cserve2/evas_cs2.h
parent28a5c6f587992b5cf5506129c86cdde95253d525 (diff)
evas/cserve2: Store glyphs in shared arrays
Also, change the internal structure of glyph listing: - Use lists instead of inlists Switch to use Glyph_Data instead of Glyph_Entry
Diffstat (limited to 'src/lib/evas/cserve2/evas_cs2.h')
-rw-r--r--src/lib/evas/cserve2/evas_cs2.h25
1 files changed, 18 insertions, 7 deletions
diff --git a/src/lib/evas/cserve2/evas_cs2.h b/src/lib/evas/cserve2/evas_cs2.h
index 19bf8063ac..329d0d2278 100644
--- a/src/lib/evas/cserve2/evas_cs2.h
+++ b/src/lib/evas/cserve2/evas_cs2.h
@@ -287,12 +287,12 @@ typedef struct _Shm_Object Shm_Object;
287typedef struct _Index_Entry Index_Entry; 287typedef struct _Index_Entry Index_Entry;
288typedef struct _File_Data File_Data; 288typedef struct _File_Data File_Data;
289typedef struct _Image_Data Image_Data; 289typedef struct _Image_Data Image_Data;
290typedef struct _Glyph_Data Glyph_Data;
290typedef struct _Shared_Array_Header Shared_Array_Header; 291typedef struct _Shared_Array_Header Shared_Array_Header;
291typedef int string_t; 292typedef int string_t;
292#define SHMOBJECT unsigned int id; unsigned int refcount 293#define SHMOBJECT unsigned int id; unsigned int refcount
293 294
294struct _Shared_Array_Header 295struct _Shared_Array_Header {
295{
296 int32_t tag; 296 int32_t tag;
297 int32_t elemsize; 297 int32_t elemsize;
298 int32_t count; 298 int32_t count;
@@ -303,13 +303,11 @@ struct _Shared_Array_Header
303 int32_t _reserved2; 303 int32_t _reserved2;
304}; 304};
305 305
306struct _Shm_Object 306struct _Shm_Object {
307{
308 SHMOBJECT; 307 SHMOBJECT;
309}; 308};
310 309
311struct _Index_Entry 310struct _Index_Entry {
312{
313 SHMOBJECT; 311 SHMOBJECT;
314 // Block entry 312 // Block entry
315 int32_t length; 313 int32_t length;
@@ -332,7 +330,7 @@ struct _File_Data {
332 330
333struct _Image_Data { 331struct _Image_Data {
334 SHMOBJECT; 332 SHMOBJECT;
335 unsigned int file_id; 333 uint32_t file_id;
336 string_t shm_id; 334 string_t shm_id;
337 Evas_Image_Load_Opts opts; 335 Evas_Image_Load_Opts opts;
338 Eina_Bool alpha_sparse : 1; 336 Eina_Bool alpha_sparse : 1;
@@ -340,6 +338,19 @@ struct _Image_Data {
340 Eina_Bool doload : 1; 338 Eina_Bool doload : 1;
341}; 339};
342 340
341struct _Glyph_Data {
342 SHMOBJECT;
343 uint32_t index;
344 string_t shm_id;
345 uint32_t offset;
346 uint32_t size;
347 uint32_t rows;
348 uint32_t width;
349 uint32_t pitch;
350 uint32_t num_grays;
351 uint32_t pixel_mode;
352};
353
343struct _Msg_Error { 354struct _Msg_Error {
344 Msg_Base base; 355 Msg_Base base;
345 int error; 356 int error;