diff --git a/.cirrus.yml b/.cirrus.yml index 65e2c15..ee40071 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -3,7 +3,7 @@ freebsd_instance: main_task: script: - - echo "Hello cirrus" + - uname -a - ls - yes | pkg install cmake - cc --version @@ -21,4 +21,15 @@ main_task: - c++ -Wall -Wextra -Werror -DFT_CONGIG_HAVE_WCHAR fort.cpp -c -o fort.o - rm fort.o - rm fort.cpp - - cd .. \ No newline at end of file + - cd .. + + # Perform out-of-source build(CMake backend generation, build, and test) + # Test build without optimizations and with asan + - mkdir -p build + - cd build + - cmake .. -DFORT_BUILD_TYPE=asan + - cmake --build . --target all + - ls + - ./libfort_example + - ./libfort_test_dev + - ./libfort_test \ No newline at end of file diff --git a/lib/fort.c b/lib/fort.c index 1bba4ba..e470ce3 100644 --- a/lib/fort.c +++ b/lib/fort.c @@ -2927,8 +2927,7 @@ static fort_status_t set_cell_property_impl(fort_cell_props_t *opt, uint32_t pro if (v == FT_TSTYLE_DEFAULT) { opt->cell_text_style = FT_TSTYLE_DEFAULT; } else { -// opt->cell_text_style = (enum ft_text_style)(opt->cell_text_style | v); - opt->cell_text_style |= v; + opt->cell_text_style = (enum ft_text_style)(opt->cell_text_style | v); } } else if (PROP_IS_SET(property, FT_CPROP_CONT_TEXT_STYLE)) { enum ft_text_style v = (enum ft_text_style)value; diff --git a/src/properties.c b/src/properties.c index 4c8ccea..a193355 100644 --- a/src/properties.c +++ b/src/properties.c @@ -471,8 +471,7 @@ static fort_status_t set_cell_property_impl(fort_cell_props_t *opt, uint32_t pro if (v == FT_TSTYLE_DEFAULT) { opt->cell_text_style = FT_TSTYLE_DEFAULT; } else { -// opt->cell_text_style = (enum ft_text_style)(opt->cell_text_style | v); - opt->cell_text_style |= v; + opt->cell_text_style = (enum ft_text_style)(opt->cell_text_style | v); } } else if (PROP_IS_SET(property, FT_CPROP_CONT_TEXT_STYLE)) { enum ft_text_style v = (enum ft_text_style)value;