From 033a7383bb93c0aa5a0da400f142eff9efd76c6f Mon Sep 17 00:00:00 2001 From: Lars-Peter Clausen Date: Tue, 2 Jun 2009 15:09:09 +0000 Subject: [PATCH] Don't call evas_object_image_scale_hint_set on Evas_Rectangle objects. This caused random segfaults previously, which could be workedaround by enabling evas-magic-debug. Not that the problem fixed we can disable it again. SVN-Revision: 16299 --- ...age_scale_hint_set-on-rectangle-objects.patch | 16 ++++++++++++++++ efl/evas/Makefile | 2 +- 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 efl/edje/patches/005-dont-call-evas_object_image_scale_hint_set-on-rectangle-objects.patch diff --git a/efl/edje/patches/005-dont-call-evas_object_image_scale_hint_set-on-rectangle-objects.patch b/efl/edje/patches/005-dont-call-evas_object_image_scale_hint_set-on-rectangle-objects.patch new file mode 100644 index 0000000000..7516c0f972 --- /dev/null +++ b/efl/edje/patches/005-dont-call-evas_object_image_scale_hint_set-on-rectangle-objects.patch @@ -0,0 +1,16 @@ +diff --git a/src/lib/edje_calc.c b/src/lib/edje_calc.c +index dda6eba..342d51a 100644 +--- a/src/lib/edje_calc.c ++++ b/src/lib/edje_calc.c +@@ -1548,10 +1548,10 @@ _edje_part_recalc(Edje *ed, Edje_Real_Part *ep, int flags) + /* Common move, resize and color_set for all part. */ + switch (ep->part->type) + { +- case EDJE_PART_TYPE_RECTANGLE: + case EDJE_PART_TYPE_IMAGE: + evas_object_image_scale_hint_set(ep->object, + chosen_desc->image.scale_hint); ++ case EDJE_PART_TYPE_RECTANGLE: + case EDJE_PART_TYPE_TEXTBLOCK: + case EDJE_PART_TYPE_GRADIENT: + case EDJE_PART_TYPE_BOX: diff --git a/efl/evas/Makefile b/efl/evas/Makefile index 2b424ff8f5..ff347621a0 100644 --- a/efl/evas/Makefile +++ b/efl/evas/Makefile @@ -86,7 +86,7 @@ define Build/Configure --disable-cpu-altivec \ --disable-cpu-neon \ --enable-cpu-c \ - --enable-evas-magic-debug \ + --disable-evas-magic-debug \ --disable-scale-sample \ --enable-scale-smooth \ --disable-convert-yuv \ -- 2.30.2