summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Michael <cp.michael@samsung.com>2019-01-31 08:11:54 -0500
committerChris Michael <cp.michael@samsung.com>2019-01-31 08:11:54 -0500
commit3fcdada0fdf109f344b6aaaa65e49ddabe044c63 (patch)
tree51bab5a3fb4cc1d4e906239b26b1dc3024025d93
parentcc5a45101fea936f22c4d364709e8232a7fd3834 (diff)
ecore-evas-buffer: Fix formatting
NB: No functional changes
-rw-r--r--src/lib/ecore_evas/ecore_evas_buffer.c186
1 files changed, 93 insertions, 93 deletions
diff --git a/src/lib/ecore_evas/ecore_evas_buffer.c b/src/lib/ecore_evas/ecore_evas_buffer.c
index 8fea11a9f3..613f72dd37 100644
--- a/src/lib/ecore_evas/ecore_evas_buffer.c
+++ b/src/lib/ecore_evas/ecore_evas_buffer.c
@@ -77,10 +77,9 @@ _ecore_evas_resize(Ecore_Evas *ee, int w, int h)
77 else 77 else
78 { 78 {
79 if (bdata->pixels) 79 if (bdata->pixels)
80 bdata->free_func(bdata->data, 80 bdata->free_func(bdata->data, bdata->pixels);
81 bdata->pixels); 81 bdata->pixels =
82 bdata->pixels = bdata->alloc_func(bdata->data, 82 bdata->alloc_func(bdata->data, ee->w * ee->h * sizeof(int));
83 ee->w * ee->h * sizeof(int));
84 stride = ee->w * sizeof(int); 83 stride = ee->w * sizeof(int);
85 } 84 }
86 85
@@ -103,7 +102,7 @@ _ecore_evas_resize(Ecore_Evas *ee, int w, int h)
103 } 102 }
104 } 103 }
105 if (bdata->image) 104 if (bdata->image)
106 evas_object_image_data_set(bdata->image, bdata->pixels); 105 evas_object_image_data_set(bdata->image, bdata->pixels);
107 else 106 else
108 bdata->resized = 1; 107 bdata->resized = 1;
109} 108}
@@ -176,7 +175,7 @@ _ecore_evas_buffer_prepare(Ecore_Evas *ee)
176 175
177 evas_object_image_size_get(bdata->image, &w, &h); 176 evas_object_image_size_get(bdata->image, &w, &h);
178 if ((w != ee->w) || (h != ee->h)) 177 if ((w != ee->w) || (h != ee->h))
179 _ecore_evas_resize(ee, w, h); 178 _ecore_evas_resize(ee, w, h);
180 bdata->pixels = evas_object_image_data_get(bdata->image, 1); 179 bdata->pixels = evas_object_image_data_get(bdata->image, 1);
181 } 180 }
182 else if (bdata->resized) 181 else if (bdata->resized)
@@ -522,7 +521,7 @@ _ecore_evas_buffer_alpha_set(Ecore_Evas *ee, int alpha)
522 if (((ee->alpha) && (alpha)) || ((!ee->alpha) && (!alpha))) return; 521 if (((ee->alpha) && (alpha)) || ((!ee->alpha) && (!alpha))) return;
523 ee->alpha = alpha; 522 ee->alpha = alpha;
524 if (bdata->image) 523 if (bdata->image)
525 evas_object_image_alpha_set(bdata->image, ee->alpha); 524 evas_object_image_alpha_set(bdata->image, ee->alpha);
526 else 525 else
527 { 526 {
528 Evas_Engine_Info_Buffer *einfo; 527 Evas_Engine_Info_Buffer *einfo;
@@ -665,90 +664,90 @@ _ecore_evas_buffer_pointer_warp(const Ecore_Evas *ee, Evas_Coord x, Evas_Coord y
665static Ecore_Evas_Engine_Func _ecore_buffer_engine_func = 664static Ecore_Evas_Engine_Func _ecore_buffer_engine_func =
666{ 665{
667 _ecore_evas_buffer_free, 666 _ecore_evas_buffer_free,
668 NULL, 667 NULL,
669 NULL, 668 NULL,
670 NULL, 669 NULL,
671 NULL, 670 NULL,
672 NULL, 671 NULL,
673 NULL, 672 NULL,
674 NULL, 673 NULL,
675 NULL, 674 NULL,
676 NULL, 675 NULL,
677 NULL, 676 NULL,
678 NULL, 677 NULL,
679 NULL, 678 NULL,
680 NULL, 679 NULL,
681 NULL, 680 NULL,
682 _ecore_evas_move, 681 _ecore_evas_move,
683 NULL, 682 NULL,
684 _ecore_evas_resize, 683 _ecore_evas_resize,
685 _ecore_evas_move_resize, 684 _ecore_evas_move_resize,
686 NULL, 685 NULL,
687 NULL, 686 NULL,
688 _ecore_evas_show, 687 _ecore_evas_show,
689 NULL, 688 NULL,
690 NULL, 689 NULL,
691 NULL, 690 NULL,
692 NULL, 691 NULL,
693 _ecore_evas_buffer_title_set, 692 _ecore_evas_buffer_title_set,
694 _ecore_evas_buffer_name_class_set, 693 _ecore_evas_buffer_name_class_set,
695 NULL, 694 NULL,
696 NULL, 695 NULL,
697 NULL, 696 NULL,
698 NULL, 697 NULL,
699 NULL, 698 NULL,
700 NULL, 699 NULL,
701 NULL, 700 NULL,
702 NULL, 701 NULL,
703 NULL, 702 NULL,
704 NULL, 703 NULL,
705 NULL, 704 NULL,
706 NULL, 705 NULL,
707 NULL, 706 NULL,
708 NULL, 707 NULL,
709 NULL, 708 NULL,
710 NULL, 709 NULL,
711 _ecore_evas_buffer_ignore_events_set, 710 _ecore_evas_buffer_ignore_events_set,
712 _ecore_evas_buffer_alpha_set, 711 _ecore_evas_buffer_alpha_set,
713 NULL, //transparent 712 NULL, //transparent
714 NULL, // profiles_set 713 NULL, // profiles_set
715 _ecore_evas_buffer_profile_set, 714 _ecore_evas_buffer_profile_set,
716 715
717 NULL, 716 NULL,
718 NULL, 717 NULL,
719 NULL, 718 NULL,
720 NULL, 719 NULL,
721 NULL, 720 NULL,
722 NULL, 721 NULL,
723 722
724 NULL, 723 NULL,
725 _ecore_evas_buffer_screen_geometry_get, 724 _ecore_evas_buffer_screen_geometry_get,
726 NULL, // screen_dpi_get 725 NULL, // screen_dpi_get
727 _ecore_evas_buffer_msg_parent_send, 726 _ecore_evas_buffer_msg_parent_send,
728 _ecore_evas_buffer_msg_send, 727 _ecore_evas_buffer_msg_send,
729 728
730 _ecore_evas_buffer_pointer_xy_get, // pointer_xy_get 729 _ecore_evas_buffer_pointer_xy_get, // pointer_xy_get
731 _ecore_evas_buffer_pointer_warp, // pointer_warp 730 _ecore_evas_buffer_pointer_warp, // pointer_warp
732 731
733 NULL, // wm_rot_preferred_rotation_set 732 NULL, // wm_rot_preferred_rotation_set
734 NULL, // wm_rot_available_rotations_set 733 NULL, // wm_rot_available_rotations_set
735 NULL, // wm_rot_manual_rotation_done_set 734 NULL, // wm_rot_manual_rotation_done_set
736 NULL, // wm_rot_manual_rotation_done 735 NULL, // wm_rot_manual_rotation_done
737 736
738 NULL, // aux_hints_set 737 NULL, // aux_hints_set
739 738
740 NULL, // fn_animator_register 739 NULL, // fn_animator_register
741 NULL, // fn_animator_unregister 740 NULL, // fn_animator_unregister
742 741
743 NULL, // fn_evas_changed 742 NULL, // fn_evas_changed
744 NULL, //fn_focus_device_set 743 NULL, //fn_focus_device_set
745 NULL, //fn_callback_focus_device_in_set 744 NULL, //fn_callback_focus_device_in_set
746 NULL, //fn_callback_focus_device_out_set 745 NULL, //fn_callback_focus_device_out_set
747 NULL, //fn_callback_device_mouse_in_set 746 NULL, //fn_callback_device_mouse_in_set
748 NULL, //fn_callback_device_mouse_out_set 747 NULL, //fn_callback_device_mouse_out_set
749 NULL, //fn_pointer_device_xy_get 748 NULL, //fn_pointer_device_xy_get
750 _ecore_evas_buffer_prepare, 749 _ecore_evas_buffer_prepare,
751 NULL // fn_last_tick_get 750 NULL // fn_last_tick_get
752}; 751};
753 752
754static void * 753static void *
@@ -893,8 +892,9 @@ ecore_evas_buffer_new(int w, int h)
893 892
894 ecore_event_evas_init(); 893 ecore_event_evas_init();
895 894
896 ee = ecore_evas_buffer_allocfunc_new 895 ee =
897 (w, h, _ecore_evas_buffer_pix_alloc, _ecore_evas_buffer_pix_free, NULL); 896 ecore_evas_buffer_allocfunc_new(w, h, _ecore_evas_buffer_pix_alloc,
897 _ecore_evas_buffer_pix_free, NULL);
898 898
899 if (!ee) ecore_event_evas_shutdown(); 899 if (!ee) ecore_event_evas_shutdown();
900 900