summaryrefslogtreecommitdiff
path: root/src/bin/edje
diff options
context:
space:
mode:
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>2019-11-07 10:23:58 +0000
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2019-11-07 10:23:58 +0000
commit39240fa3e723c8b0f2dc1792cc5b938502297655 (patch)
treeecdcbf997154f0981ca4e97eff91653800bcf4fd /src/bin/edje
parente4e7ff3905090a75eb900672be7208f1f62fcf65 (diff)
Revert "evas_textblock: content fit feature"
This reverts commit 2f676a6591c117e15d65f263ebd267866963b627. This causes segv's in edje_cc - i suspect the eet changes (or in combo to how they are used in edje): AddressSanitizer:DEADLYSIGNAL ================================================================= ==8991==ERROR: AddressSanitizer: SEGV on unknown address 0x000001010000 (pc 0xffff9f002604 bp 0xfffffa747700 sp 0xfffffa747700 T0) ==8991==The signal is caused by a READ memory access. #0 0xffff9f002600 in _eet_hash_gen ../src/lib/eet/eet_utils.c:25 #1 0xffff9efdd024 in eet_dictionary_string_add ../src/lib/eet/eet_dictionary.c:103 #2 0xffff9efbe324 in eet_data_put_string ../src/lib/eet/eet_data.c:849 #3 0xffff9efc1c4c in eet_data_put_type ../src/lib/eet/eet_data.c:1427 #4 0xffff9efd9128 in eet_data_put_unknown ../src/lib/eet/eet_data.c:4730 #5 0xffff9efdb320 in _eet_data_descriptor_encode ../src/lib/eet/eet_data.c:5108 #6 0xffff9efd5958 in eet_data_put_variant ../src/lib/eet/eet_data.c:4309 #7 0xffff9efdb320 in _eet_data_descriptor_encode ../src/lib/eet/eet_data.c:5108 #8 0xffff9efd9270 in eet_data_put_unknown ../src/lib/eet/eet_data.c:4739 #9 0xffff9efdb320 in _eet_data_descriptor_encode ../src/lib/eet/eet_data.c:5108 #10 0xffff9efd8ca0 in eet_data_put_array ../src/lib/eet/eet_data.c:4692 #11 0xffff9efdb320 in _eet_data_descriptor_encode ../src/lib/eet/eet_data.c:5108 #12 0xffff9efc7768 in eet_data_write_cipher ../src/lib/eet/eet_data.c:2403 #13 0xffff9efc78a4 in eet_data_write ../src/lib/eet/eet_data.c:2420 #14 0xaaaabb151dcc in data_thread_group ../src/bin/edje/edje_cc_out.c:2045 #15 0xaaaabb152130 in data_write_groups ../src/bin/edje/edje_cc_out.c:2086 #16 0xaaaabb157734 in data_write ../src/bin/edje/edje_cc_out.c:2866 #17 0xaaaabb14122c in main ../src/bin/edje/edje_cc.c:456 #18 0xffff9dbd92a0 in __libc_start_main (/usr/lib/aarch64-linux-gnu/libc.so.6+0x242a0) #19 0xaaaabb13ea00 (/home/raster/C/git/efl/build/src/bin/edje/edje_cc+0x38a00) AddressSanitizer can not provide additional info. SUMMARY: AddressSanitizer: SEGV ../src/lib/eet/eet_utils.c:25 in _eet_hash_gen ==8991==ABORTING Aborted (core dumped) When compiling breaks... it's certainly time to revert ASAP :(
Diffstat (limited to 'src/bin/edje')
-rw-r--r--src/bin/edje/edje_cc_handlers.c81
1 files changed, 0 insertions, 81 deletions
diff --git a/src/bin/edje/edje_cc_handlers.c b/src/bin/edje/edje_cc_handlers.c
index 8353d260a3..c9bbc1744a 100644
--- a/src/bin/edje/edje_cc_handlers.c
+++ b/src/bin/edje/edje_cc_handlers.c
@@ -419,8 +419,6 @@ static void st_collections_group_parts_part_description_text_repch(void);
419static void st_collections_group_parts_part_description_text_size(void); 419static void st_collections_group_parts_part_description_text_size(void);
420static void st_collections_group_parts_part_description_text_size_range(void); 420static void st_collections_group_parts_part_description_text_size_range(void);
421static void st_collections_group_parts_part_description_text_fit(void); 421static void st_collections_group_parts_part_description_text_fit(void);
422static void st_collections_group_parts_part_description_text_fit_step(void);
423static void st_collections_group_parts_part_description_text_fit_size_array(void);
424static void st_collections_group_parts_part_description_text_min(void); 422static void st_collections_group_parts_part_description_text_min(void);
425static void st_collections_group_parts_part_description_text_max(void); 423static void st_collections_group_parts_part_description_text_max(void);
426static void st_collections_group_parts_part_description_text_align(void); 424static void st_collections_group_parts_part_description_text_align(void);
@@ -954,8 +952,6 @@ New_Statement_Handler statement_handlers[] =
954 {"collections.group.parts.part.description.text.size", st_collections_group_parts_part_description_text_size}, 952 {"collections.group.parts.part.description.text.size", st_collections_group_parts_part_description_text_size},
955 {"collections.group.parts.part.description.text.size_range", st_collections_group_parts_part_description_text_size_range}, 953 {"collections.group.parts.part.description.text.size_range", st_collections_group_parts_part_description_text_size_range},
956 {"collections.group.parts.part.description.text.fit", st_collections_group_parts_part_description_text_fit}, 954 {"collections.group.parts.part.description.text.fit", st_collections_group_parts_part_description_text_fit},
957 {"collections.group.parts.part.description.text.fit_step", st_collections_group_parts_part_description_text_fit_step},
958 {"collections.group.parts.part.description.text.fit_size_array", st_collections_group_parts_part_description_text_fit_size_array},
959 {"collections.group.parts.part.description.text.min", st_collections_group_parts_part_description_text_min}, 955 {"collections.group.parts.part.description.text.min", st_collections_group_parts_part_description_text_min},
960 {"collections.group.parts.part.description.text.max", st_collections_group_parts_part_description_text_max}, 956 {"collections.group.parts.part.description.text.max", st_collections_group_parts_part_description_text_max},
961 {"collections.group.parts.part.description.text.align", st_collections_group_parts_part_description_text_align}, 957 {"collections.group.parts.part.description.text.align", st_collections_group_parts_part_description_text_align},
@@ -11658,83 +11654,6 @@ st_collections_group_parts_part_description_text_fit(void)
11658 ed->text.fit_y = parse_bool(1); 11654 ed->text.fit_y = parse_bool(1);
11659} 11655}
11660 11656
11661
11662/**
11663 @page edcref
11664
11665 @property
11666 fit_step
11667 @parameters
11668 [font step size in points (pt)]
11669 @effect
11670 Sets the font step size for the text part. when fitting text
11671
11672 Defaults: 1
11673 @since 1.24.0
11674 @endproperty
11675 */
11676static void
11677st_collections_group_parts_part_description_text_fit_step(void)
11678{
11679 Edje_Part_Description_Text *ed;
11680
11681 check_arg_count(1);
11682
11683 if (current_part->type != EDJE_PART_TYPE_TEXTBLOCK)
11684 {
11685 ERR("parse error %s:%i. text attributes in non-TEXTBLOCK part.",
11686 file_in, line - 1);
11687 exit(-1);
11688 }
11689
11690 ed = (Edje_Part_Description_Text *)current_desc;
11691
11692 ed->text.fit_step = parse_int(0);
11693
11694 if (ed->text.fit_step < 1)
11695 {
11696 ERR("parse error %s:%i. fit step less than 1.",
11697 file_in, line - 1);
11698 exit(-1);
11699 }
11700}
11701
11702/**
11703 @page edcref
11704
11705 @property
11706 fit
11707 @parameters
11708 [Array of font sizes in points]
11709 @effect
11710 Sets the allowed font sizes array for the text part.
11711 @since 1.24.0
11712 @endproperty
11713 */
11714static void
11715st_collections_group_parts_part_description_text_fit_size_array(void)
11716{
11717 int n, argc;
11718 Edje_Part_Description_Text *ed;
11719
11720 if (current_part->type != EDJE_PART_TYPE_TEXTBLOCK)
11721 {
11722 ERR("parse error %s:%i. text attributes in non-TEXTBLOCK part.",
11723 file_in, line - 1);
11724 exit(-1);
11725 }
11726
11727 ed = (Edje_Part_Description_Text *)current_desc;
11728 check_min_arg_count(1);
11729
11730 for (n = 0, argc = get_arg_count(); n < argc; n++)
11731 {
11732 unsigned int *value = malloc(sizeof(unsigned int));
11733 *value = (unsigned int) parse_int(n);
11734 ed->text.fit_size_array = eina_list_append(ed->text.fit_size_array, value);
11735 }
11736}
11737
11738/** 11657/**
11739 @page edcref 11658 @page edcref
11740 11659