summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMoonhee Choi <mh0310.choi@samsung.com>2017-08-18 02:03:24 +0000
committerGerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>2017-08-18 02:03:24 +0000
commit213630fa0b6d28c6d9932cb81c13e3c7c106869d (patch)
tree306a9e55687e23dc5a3ab89ea24eb2f51eff51e0
parent536c48cb26cd6a7b755d0f11dc8053fe962ae089 (diff)
parent1bf971336d6e204ad0b2937a9f805345d9aaef2e (diff)
downloadcairo-accepted/tizen_3.0_wearable.tar.gz
cairo-accepted/tizen_3.0_wearable.tar.bz2
cairo-accepted/tizen_3.0_wearable.zip
-rw-r--r--src/cairo-default-context.c2
-rw-r--r--src/cairo-gl-operand.c7
2 files changed, 7 insertions, 2 deletions
diff --git a/src/cairo-default-context.c b/src/cairo-default-context.c
index 36ddb7575..375c0afba 100644
--- a/src/cairo-default-context.c
+++ b/src/cairo-default-context.c
@@ -951,7 +951,7 @@ _cairo_default_context_rounded_rectangle (void *abstract_cr,
if (r_top_left <= 0.0)
r_top_left = 0.0;
if (r_top_right <= 0.0)
- r_top_left = 0.0;
+ r_top_right = 0.0;
if (r_bottom_left < 0.0)
r_bottom_left = 0.0;
if (r_bottom_right <= 0.0)
diff --git a/src/cairo-gl-operand.c b/src/cairo-gl-operand.c
index 575096a84..1d480d940 100644
--- a/src/cairo-gl-operand.c
+++ b/src/cairo-gl-operand.c
@@ -804,11 +804,17 @@ _cairo_gl_pattern_texture_setup (cairo_gl_operand_t *operand,
if (src_is_gl_surface) {
status = _cairo_gl_context_acquire (dst->base.device, &ctx);
if (unlikely (status))
+ {
+ _cairo_surface_unmap_image (&surface->base, image);
goto fail;
+ }
/* one more time acquire */
status = _cairo_gl_context_acquire (dst->base.device, &ctx);
if (unlikely (status))
+ {
+ _cairo_surface_unmap_image (&surface->base, image);
goto fail;
+ }
}
status = _cairo_surface_unmap_image (&surface->base, image);
@@ -833,7 +839,6 @@ _cairo_gl_pattern_texture_setup (cairo_gl_operand_t *operand,
fail:
cairo_surface_destroy (&surface->base);
- cairo_surface_destroy (image);
return status;
}