Merge branch 'master' into server-decoration

2 files changed, 20 insertions, 0 deletions

diff --git a/wayland/cairo.c b/wayland/cairo.c
index ba439d9d..193205b1 100644
--- a/wayland/cairo.c
+++ b/wayland/cairo.c
@@ -8,6 +8,25 @@ void cairo_set_source_u32(cairo_t *cairo, uint32_t color) {
                         (color >> (0*8) & 0xFF) / 255.0);
 }
 
+cairo_surface_t *cairo_image_surface_scale(cairo_surface_t *image, int width, int height) {
+        int image_width = cairo_image_surface_get_width(image);
+        int image_height = cairo_image_surface_get_height(image);
+
+        cairo_surface_t *new =
+                cairo_image_surface_create(CAIRO_FORMAT_ARGB32, width, height);
+
+        cairo_t *cairo = cairo_create(new);
+
+        cairo_scale(cairo, (double) width / image_width, (double) height / image_height);
+
+        cairo_set_source_surface(cairo, image, 0, 0);
+        cairo_paint(cairo);
+
+        cairo_destroy(cairo);
+
+        return new;
+}
+
 #ifdef WITH_GDK_PIXBUF
 #include <gdk-pixbuf/gdk-pixbuf.h>
 
diff --git a/wayland/pango.c b/wayland/pango.c
index 702ab15c..f9eec98c 100644
--- a/wayland/pango.c
+++ b/wayland/pango.c
@@ -5,6 +5,7 @@
 #include <string.h>
 #include <stdio.h>
 #include <stdbool.h>
+#include <stdint.h>
 #include "log.h"
 
 PangoLayout *get_pango_layout(cairo_t *cairo, const char *font, const char *text,