From 7792fbb2952a1709c4111e99a001a7bedf2dfcb6 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jean-Philippe=20Bruy=C3=A8re?= Date: Fri, 3 May 2019 16:50:59 +0200 Subject: [PATCH] typo + travis --- .travis.yml | 19 +++++++++++++++++++ include/vkvg.h | 2 +- src/vkvg_pattern.c | 2 +- tests/gradient.c | 25 +++++++++++++++++++++---- tests/gradient_transform.c | 6 +++--- 5 files changed, 45 insertions(+), 9 deletions(-) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..9517c62 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,19 @@ +language: c +os: + - linux + - osx +compiler: + - gcc + - clang +addons: + apt: + packages: + - libvulkan + + +script: + - mkdir build + - cd build + - cmake .. + - make -j 4 + diff --git a/include/vkvg.h b/include/vkvg.h index 78f0202..1fbf8ab 100644 --- a/include/vkvg.h +++ b/include/vkvg.h @@ -321,7 +321,7 @@ VkvgPattern vkvg_pattern_create_radial (float cx0, float cy0, float radius0 float cx1, float cy1, float radius1); void vkvg_pattern_destroy (VkvgPattern pat); -void vkvg_patter_add_color_stop (VkvgPattern pat, float offset, float r, float g, float b, float a); +void vkvg_pattern_add_color_stop(VkvgPattern pat, float offset, float r, float g, float b, float a); void vkvg_pattern_set_extend (VkvgPattern pat, vkvg_extend_t extend); void vkvg_pattern_set_filter (VkvgPattern pat, vkvg_filter_t filter); diff --git a/src/vkvg_pattern.c b/src/vkvg_pattern.c index 5fb23a9..7fd6231 100644 --- a/src/vkvg_pattern.c +++ b/src/vkvg_pattern.c @@ -113,7 +113,7 @@ VkvgPattern vkvg_pattern_reference (VkvgPattern pat) { uint32_t vkvg_pattern_get_reference_count (VkvgPattern pat) { return pat->references; } -void vkvg_patter_add_color_stop (VkvgPattern pat, float offset, float r, float g, float b, float a) { +void vkvg_pattern_add_color_stop (VkvgPattern pat, float offset, float r, float g, float b, float a) { if (pat->type == VKVG_PATTERN_TYPE_SURFACE || pat->type == VKVG_PATTERN_TYPE_SOLID){ return; diff --git a/tests/gradient.c b/tests/gradient.c index b1a36cd..839f167 100644 --- a/tests/gradient.c +++ b/tests/gradient.c @@ -5,9 +5,9 @@ void test(){ VkvgPattern pat = vkvg_pattern_create_linear(100,0,300,0); vkvg_set_line_width(ctx, 20); - vkvg_patter_add_color_stop(pat, 0, 1, 0, 0, 1); - vkvg_patter_add_color_stop(pat, 0.5, 0, 1, 0, 1); - vkvg_patter_add_color_stop(pat, 1, 0, 0, 1, 1); + vkvg_pattern_add_color_stop(pat, 0, 1, 0, 0, 1); + vkvg_pattern_add_color_stop(pat, 0.5, 0, 1, 0, 1); + vkvg_pattern_add_color_stop(pat, 1, 0, 0, 1, 1); vkvg_set_source (ctx, pat); vkvg_rectangle(ctx,100,100,200,200); vkvg_fill (ctx); @@ -16,10 +16,27 @@ void test(){ vkvg_destroy(ctx); } +void test2(){ + VkvgContext ctx = vkvg_create(surf); + + vkvg_set_source_rgb(ctx,1,0,0); + vkvg_paint(ctx); + + VkvgPattern pat = vkvg_pattern_create_linear(100,0,300,0); + vkvg_set_line_width(ctx, 20); + vkvg_pattern_add_color_stop(pat, 0, 1, 1, 1, 1); + vkvg_pattern_add_color_stop(pat, 1, 1, 1, 0, 0); + vkvg_set_source (ctx, pat); + vkvg_rectangle(ctx,100,100,200,200); + vkvg_fill (ctx); + //vkvg_stroke (ctx); + vkvg_pattern_destroy (pat); + vkvg_destroy(ctx); +} int main(int argc, char *argv[]) { - perform_test (test, 1024, 768); + perform_test (test2, 1024, 768); return 0; } diff --git a/tests/gradient_transform.c b/tests/gradient_transform.c index 7f6ef55..4668ca0 100644 --- a/tests/gradient_transform.c +++ b/tests/gradient_transform.c @@ -10,9 +10,9 @@ void test(){ vkvg_scale(ctx,2,2); VkvgPattern pat = vkvg_pattern_create_linear(0,0,200,0); vkvg_set_line_width(ctx, 20); - vkvg_patter_add_color_stop(pat, 0, 1, 0, 0, 1); - vkvg_patter_add_color_stop(pat, 0.5, 0, 1, 0, 1); - vkvg_patter_add_color_stop(pat, 1, 0, 0, 1, 1); + vkvg_pattern_add_color_stop(pat, 0, 1, 0, 0, 1); + vkvg_pattern_add_color_stop(pat, 0.5, 0, 1, 0, 1); + vkvg_pattern_add_color_stop(pat, 1, 0, 0, 1, 1); vkvg_set_source (ctx, pat); vkvg_rectangle(ctx,0,0,200,200); vkvg_fill (ctx); -- 2.47.3