Merge branch 'warnings' into 'master'

Add -Werror for meson CI build

See merge request cairo/cairo!320

.gitlab-ci.yml

@@ -209,6 +209,7 @@ fedora meson build:
       ${DEFAULT_MESON_ARGS}
       -Dgl-backend=gl
   script:
+    - export CFLAGS="-Werror -Wno-error=deprecated-declarations"
     - meson builddir ${MESON_ARGS}
     - ninja -C builddir
     # - ninja -C builddir test

src/cairo-gl-glyphs.c

@@ -181,6 +181,8 @@ cairo_gl_context_get_glyph_cache (cairo_gl_context_t *ctx,
     cairo_content_t content;
 
     switch (format) {
+    case CAIRO_FORMAT_RGBA128F:
+    case CAIRO_FORMAT_RGB96F:
     case CAIRO_FORMAT_RGB30:
     case CAIRO_FORMAT_RGB16_565:
     case CAIRO_FORMAT_ARGB32:

src/cairo-gl-info.c

@@ -59,8 +59,9 @@ _cairo_gl_get_version (void)
 }
 
 
-cairo_gl_flavor_t
-_cairo_gl_degrade_flavor_by_build_features (cairo_gl_flavor_t flavor) {
+static cairo_gl_flavor_t
+_cairo_gl_degrade_flavor_by_build_features (cairo_gl_flavor_t flavor)
+{
     switch(flavor) {
     case CAIRO_GL_FLAVOR_DESKTOP:
 #if CAIRO_HAS_GL_SURFACE
@@ -83,6 +84,7 @@ _cairo_gl_degrade_flavor_by_build_features (cairo_gl_flavor_t flavor) {
 	/* intentional fall through: no OpenGL in first place or no surfaces for it's version */
 #endif
 
+    case CAIRO_GL_FLAVOR_NONE:
     default:
 	return CAIRO_GL_FLAVOR_NONE;
     }

src/cairo-gl-surface.c

@@ -294,6 +294,8 @@ _cairo_gl_get_image_format_and_type_gl (pixman_format_code_t pixman_format,
     case PIXMAN_r8g8b8x8:
     case PIXMAN_r8g8b8a8:
     case PIXMAN_x14r6g6b6:
+    case PIXMAN_rgb_float:
+    case PIXMAN_rgba_float:
     default:
 	return FALSE;
     }