diff --git a/ChangeLog b/ChangeLog index 672dddf8..ac8b23aa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +1.3.13 + . Resolve minor spacing issue in rtl non-overlap kerning + . python3 for graphite.py + . Better fuzzing + . Better building on windows + 1.3.12 . Graphite no longer does dumb rendering for fonts with no smarts . Segment caching code removed. Anything attempting to use the segment cache gets given a regular face instead diff --git a/debian-src/changelog b/debian-src/changelog index 1aae2124..8dc3e021 100644 --- a/debian-src/changelog +++ b/debian-src/changelog @@ -1,3 +1,9 @@ +graphite2 (1.3.13~palaso1ubuntu1) bionic; urgency=medium + + * Minor bug fixes release + + -- Martin Hosken Mon, 20 Dec 2018 13:04:23 +0700 + graphite2 (1.3.12~palaso1ubuntu1) bionic; urgency=medium * Minor bug fixes release diff --git a/doc/building.txt b/doc/building.txt index 3a2d3d8a..18a33c93 100644 --- a/doc/building.txt +++ b/doc/building.txt @@ -159,8 +159,8 @@ GRAPHITE2_VM_TYPE:STRING:: GRAPHITE2_SANITIZERS:STRING:: This turns on compile time support for the specified sanitizers. This works with both gcc and clang, though there are some differences in which - sanitizers each offers. If fuzzer is one of them then it will cause the - libFuzzer based fuzzing targets to be built as well. + + sanitizers each offers. The fuzzer sanitizer causes libFuzzer based fuzzing + targets to be built as well, but this currently only works under clang. + The default is an empty string. Bear in mind that ASAN will not work with ulimit constraints so running the diff --git a/doc/release.txt b/doc/release.txt index 00d3d5c5..9dd7e8cc 100644 --- a/doc/release.txt +++ b/doc/release.txt @@ -4,7 +4,6 @@ These notes are not necessarily part of the manual. They are here for code developers to remember to do the right thing when it comes to release day. . `make` and `make docs` -. `make fuzztest` and check .log file results . The first line of the Changelog must be the version number. This is so that packagers can extract the version number from the source. . Make sure the version numbers in the `#defines` reflect the release number in diff --git a/include/graphite2/Font.h b/include/graphite2/Font.h index ae5f28c4..3e8214d4 100644 --- a/include/graphite2/Font.h +++ b/include/graphite2/Font.h @@ -30,7 +30,7 @@ #define GR2_VERSION_MAJOR 1 #define GR2_VERSION_MINOR 3 -#define GR2_VERSION_BUGFIX 12 +#define GR2_VERSION_BUGFIX 13 #ifdef __cplusplus extern "C" diff --git a/tests/fuzz-tests/CMakeLists.txt b/tests/fuzz-tests/CMakeLists.txt index df0d27ff..97f31828 100644 --- a/tests/fuzz-tests/CMakeLists.txt +++ b/tests/fuzz-tests/CMakeLists.txt @@ -16,31 +16,31 @@ function(hasr VAR RESULT) endif () endfunction() -add_custom_target(fuzztest) -file(GLOB_RECURSE tfiles RELATIVE ${PROJECT_SOURCE_DIR} *.fuzz) -set(lastfontname "") -set(excludednames "libfuzz-corpus") -if (NOT GRAPHITE2_SANITIZERS MATCHES "address") - set(noasan -t 20 --memory=8000 --valgrind) -endif () +# add_custom_target(fuzztest) +# file(GLOB_RECURSE tfiles RELATIVE ${PROJECT_SOURCE_DIR} *.fuzz) +# set(lastfontname "") +# set(excludednames "libfuzz-corpus") +# if (NOT GRAPHITE2_SANITIZERS MATCHES "address") +# set(noasan -t 20 --memory=8000 --valgrind) +# endif () -foreach (tfile IN LISTS tfiles) - set(tpath ${tfile}) - trimtail(tpath tname) - trimtail(tpath textname) - trimtail(tpath fname) - if (NOT excludednames MATCHES ${fname}) - hasr(tname dirargs) - if (NOT lastfontname EQUAL fname) - add_custom_command(TARGET fuzztest PRE_BUILD COMMAND echo ${fname}) - set(lastfontname ${fname}) - endif() - add_custom_command(TARGET fuzztest PRE_BUILD COMMAND ${PROJECT_SOURCE_DIR}/../fuzztest ARGS -l fuzzregress-${fname}-${textname}-${tname}.log -f ${PROJECT_SOURCE_DIR}/../fonts/${fname}.ttf -q ${noasan} --include=required,graphite --exclude==fontdir,opentype,volt,advtypo,post -V -k --input=${PROJECT_SOURCE_DIR}/${fname}/${textname}/${tname} -- ../comparerenderer/comparerenderer -q ${dirargs} -s 12 -n -f {} -t ${PROJECT_SOURCE_DIR}/../texts/${textname}.txt) - add_custom_command(TARGET fuzztest POST_BUILD COMMAND test -s fuzzregress-${fname}-${textname}-${tname}.log && echo test: ${fname} ${textname} ${tname} failed. || true) - add_custom_command(TARGET fuzztest PRE_BUILD COMMAND ${PROJECT_SOURCE_DIR}/../fuzztest ARGS -l fuzzregress-demand-${fname}-${textname}-${tname}.log -f ${PROJECT_SOURCE_DIR}/../fonts/${fname}.ttf -q ${noasan} --include=required,graphite --exclude==fontdir,opentype,volt,advtypo,post -V -k --input=${PROJECT_SOURCE_DIR}/${fname}/${textname}/${tname} -- ../comparerenderer/comparerenderer --demand -q ${dirargs} -s 12 -n -f {} -t ${PROJECT_SOURCE_DIR}/../texts/${textname}.txt) - add_custom_command(TARGET fuzztest POST_BUILD COMMAND test -s fuzzregress-demand-${fname}-${textname}-${tname}.log && echo demand test: ${fname} ${textname} ${tname} failed. || true) - endif () -endforeach() +# foreach (tfile IN LISTS tfiles) +# set(tpath ${tfile}) +# trimtail(tpath tname) +# trimtail(tpath textname) +# trimtail(tpath fname) +# if (NOT excludednames MATCHES ${fname}) +# hasr(tname dirargs) +# if (NOT lastfontname EQUAL fname) +# add_custom_command(TARGET fuzztest PRE_BUILD COMMAND echo ${fname}) +# set(lastfontname ${fname}) +# endif() +# add_custom_command(TARGET fuzztest PRE_BUILD COMMAND ${PROJECT_SOURCE_DIR}/../fuzztest ARGS -l fuzzregress-${fname}-${textname}-${tname}.log -f ${PROJECT_SOURCE_DIR}/../fonts/${fname}.ttf -q ${noasan} --include=required,graphite --exclude==fontdir,opentype,volt,advtypo,post -V -k --input=${PROJECT_SOURCE_DIR}/${fname}/${textname}/${tname} -- ../comparerenderer/comparerenderer -q ${dirargs} -s 12 -n -f {} -t ${PROJECT_SOURCE_DIR}/../texts/${textname}.txt) +# add_custom_command(TARGET fuzztest POST_BUILD COMMAND test -s fuzzregress-${fname}-${textname}-${tname}.log && echo test: ${fname} ${textname} ${tname} failed. || true) +# add_custom_command(TARGET fuzztest PRE_BUILD COMMAND ${PROJECT_SOURCE_DIR}/../fuzztest ARGS -l fuzzregress-demand-${fname}-${textname}-${tname}.log -f ${PROJECT_SOURCE_DIR}/../fonts/${fname}.ttf -q ${noasan} --include=required,graphite --exclude==fontdir,opentype,volt,advtypo,post -V -k --input=${PROJECT_SOURCE_DIR}/${fname}/${textname}/${tname} -- ../comparerenderer/comparerenderer --demand -q ${dirargs} -s 12 -n -f {} -t ${PROJECT_SOURCE_DIR}/../texts/${textname}.txt) +# add_custom_command(TARGET fuzztest POST_BUILD COMMAND test -s fuzzregress-demand-${fname}-${textname}-${tname}.log && echo demand test: ${fname} ${textname} ${tname} failed. || true) +# endif () +# endforeach() if (GRAPHITE2_SANITIZERS MATCHES "fuzzer") add_executable(gr-fuzzer-segment gr-fuzzer-segment.cpp)