summaryrefslogtreecommitdiff
path: root/src/lib/evas/include
diff options
context:
space:
mode:
authorCedric Bail <cedric.bail@samsung.com>2013-04-25 15:05:18 +0900
committerCedric Bail <cedric.bail@samsung.com>2013-05-06 19:02:04 +0900
commitc5b0d28d73d2e5a534d071e9e14b34ec9b4c2726 (patch)
tree5f92448bf7fdf10857f47b1169a3c5d603a3a80a /src/lib/evas/include
parent2b61da5a5a028d8f1ad5e54e316a72c70caebb7c (diff)
evas: move flags and attribute around.
Diffstat (limited to 'src/lib/evas/include')
-rw-r--r--src/lib/evas/include/evas_common.h69
1 files changed, 44 insertions, 25 deletions
diff --git a/src/lib/evas/include/evas_common.h b/src/lib/evas/include/evas_common.h
index 1e8907bdd9..d79e32bcfd 100644
--- a/src/lib/evas/include/evas_common.h
+++ b/src/lib/evas/include/evas_common.h
@@ -352,6 +352,8 @@ typedef unsigned short DATA16;
352typedef unsigned char DATA8; 352typedef unsigned char DATA8;
353 353
354typedef struct _Image_Entry Image_Entry; 354typedef struct _Image_Entry Image_Entry;
355typedef struct _Image_Entry_Property Image_Entry_Property;
356typedef struct _Image_Entry_Animated Image_Entry_Animated;
355typedef struct _Image_Entry_Flags Image_Entry_Flags; 357typedef struct _Image_Entry_Flags Image_Entry_Flags;
356typedef struct _Image_Entry_Frame Image_Entry_Frame; 358typedef struct _Image_Entry_Frame Image_Entry_Frame;
357typedef struct _Image_Timestamp Image_Timestamp; 359typedef struct _Image_Timestamp Image_Timestamp;
@@ -514,24 +516,24 @@ struct _RGBA_Image_Loadopts
514 516
515struct _Image_Entry_Flags 517struct _Image_Entry_Flags
516{ 518{
517 Eina_Bool loaded : 1; 519 Eina_Bool loaded : 1;
518 Eina_Bool in_progress : 1; 520 Eina_Bool in_progress : 1;
519 Eina_Bool dirty : 1; 521 Eina_Bool dirty : 1;
520 Eina_Bool activ : 1; 522 Eina_Bool activ : 1;
521 523
522 Eina_Bool need_data : 1; 524 Eina_Bool need_data : 1;
523 Eina_Bool lru_nodata : 1; 525 Eina_Bool lru_nodata : 1;
524 Eina_Bool cached : 1; 526 Eina_Bool cached : 1;
525 Eina_Bool alpha : 1; 527 Eina_Bool alpha : 1;
526 528
527 Eina_Bool lru : 1; 529 Eina_Bool lru : 1;
528 Eina_Bool alpha_sparse : 1; 530 Eina_Bool alpha_sparse : 1;
529 Eina_Bool preload_done : 1; 531 Eina_Bool preload_done : 1;
530 Eina_Bool delete_me : 1; 532 Eina_Bool delete_me : 1;
531 533
532 Eina_Bool pending : 1; 534 Eina_Bool pending : 1;
533 Eina_Bool animated : 1; 535 Eina_Bool rotated : 1;
534 Eina_Bool rotated : 1; 536 Eina_Bool unload_cancel : 1;
535}; 537};
536 538
537struct _Image_Entry_Frame 539struct _Image_Entry_Frame
@@ -542,6 +544,17 @@ struct _Image_Entry_Frame
542 Eina_Bool loaded : 1; 544 Eina_Bool loaded : 1;
543}; 545};
544 546
547struct _Image_Entry_Animated
548{
549 Eina_List *frames;
550 Evas_Image_Animated_Loop_Hint loop_hint;
551 int frame_count;
552 int loop_count;
553 int cur_frame;
554
555 Eina_Bool animated : 1;
556};
557
545struct _Evas_Cache_Target 558struct _Evas_Cache_Target
546{ 559{
547 EINA_INLIST; 560 EINA_INLIST;
@@ -559,6 +572,16 @@ struct _Image_Timestamp
559#endif 572#endif
560}; 573};
561 574
575struct _Image_Entry_Property
576{
577 unsigned int w;
578 unsigned int h;
579
580 unsigned char scale;
581
582 Eina_Bool alpha;
583};
584
562struct _Image_Entry 585struct _Image_Entry
563{ 586{
564 EINA_INLIST; 587 EINA_INLIST;
@@ -584,13 +607,14 @@ struct _Image_Entry
584 RGBA_Pipe *pipe; 607 RGBA_Pipe *pipe;
585#endif 608#endif
586 609
587 unsigned char scale;
588
589 RGBA_Image_Loadopts load_opts; 610 RGBA_Image_Loadopts load_opts;
590 int space; 611 int space;
612
591 unsigned int w; 613 unsigned int w;
592 unsigned int h; 614 unsigned int h;
593 615
616 unsigned char scale;
617
594 struct 618 struct
595 { 619 {
596 unsigned int w; 620 unsigned int w;
@@ -605,7 +629,6 @@ struct _Image_Entry
605 629
606 LK(lock); 630 LK(lock);
607 LK(lock_cancel); 631 LK(lock_cancel);
608 Eina_Bool unload_cancel : 1;
609 632
610 Image_Entry_Flags flags; 633 Image_Entry_Flags flags;
611 Evas_Image_Scale_Hint scale_hint; 634 Evas_Image_Scale_Hint scale_hint;
@@ -619,11 +642,7 @@ struct _Image_Entry
619 int load_error; 642 int load_error;
620 643
621 /* for animation feature */ 644 /* for animation feature */
622 int frame_count; 645 Image_Entry_Animated animated;
623 Evas_Image_Animated_Loop_Hint loop_hint;
624 int loop_count;
625 int cur_frame;
626 Eina_List *frames;
627}; 646};
628 647
629struct _Engine_Image_Entry 648struct _Engine_Image_Entry