summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--packaging/cairo.spec1
-rw-r--r--src/cairo-gl-info.c2
-rw-r--r--src/cairo-image-compositor.c4
3 files changed, 4 insertions, 3 deletions
diff --git a/packaging/cairo.spec b/packaging/cairo.spec
index 3667922f2..58309dbc0 100644
--- a/packaging/cairo.spec
+++ b/packaging/cairo.spec
@@ -26,6 +26,7 @@ BuildRequires: which
BuildRequires: pkgconfig(ecore)
BuildRequires: pkgconfig(evas)
BuildRequires: pkgconfig(ttrace)
+BuildRequires: gtk-doc
%if %{with cairo_gl_backend}
%if %{with x} && %{with desktop}
BuildRequires: pkgconfig(gl)
diff --git a/src/cairo-gl-info.c b/src/cairo-gl-info.c
index 5da1eac44..53ba3d20b 100644
--- a/src/cairo-gl-info.c
+++ b/src/cairo-gl-info.c
@@ -130,7 +130,7 @@ _cairo_gl_has_extension (cairo_gl_dispatch_t *dispatch, const char *ext)
for (i = 0; i < (int)max_num_extensions; i++) {
const char *extension = (const char *) dispatch->GetStringi (GL_EXTENSIONS, i);
- if (strstr (extension, ext) == 0)
+ if (strstr (extension, ext) != NULL)
return TRUE;
}
return FALSE;
diff --git a/src/cairo-image-compositor.c b/src/cairo-image-compositor.c
index e343d275a..1822584d9 100644
--- a/src/cairo-image-compositor.c
+++ b/src/cairo-image-compositor.c
@@ -2370,7 +2370,7 @@ _fill_xrgb32_lerp_opaque_spans (void *abstract_renderer, int y, int h,
do {
int len = spans[1].x - spans[0].x;
uint32_t *d = (uint32_t*)(r->u.fill.data + r->u.fill.stride*yy + spans[0].x*4);
- while (len--)
+ while (len-- > 0)
*d++ = r->u.fill.pixel;
yy++;
} while (--hh);
@@ -2380,7 +2380,7 @@ _fill_xrgb32_lerp_opaque_spans (void *abstract_renderer, int y, int h,
do {
int len = spans[1].x - spans[0].x;
uint32_t *d = (uint32_t *)(r->u.fill.data + r->u.fill.stride*yy + spans[0].x*4);
- while (len--) {
+ while (len-- > 0) {
*d = lerp8x4 (r->u.fill.pixel, a, *d);
d++;
}