Do all svp text rendering with cairo

enabling us to delete a whole pile of foo

For android we patch cairo, which is internal in that case, to swap the rgb
components so that cairo then matches the OpenGL GL_RGBA format so we can use
it there where we don't have GL_BGRA support.

Change-Id: I25e34889c7b7263438b143dd2a2ad882fb0f190a

1 files changed, 5 insertions, 4 deletions

diff --git a/libreofficekit/source/gtk/tilebuffer.cxx b/libreofficekit/source/gtk/tilebuffer.cxx
index 675384c4582e..bded6b1ad853 100644
--- a/libreofficekit/source/gtk/tilebuffer.cxx
+++ b/libreofficekit/source/gtk/tilebuffer.cxx
@@ -28,18 +28,19 @@ float twipToPixel(float fInput, float zoom)
    Tile class member functions
    ----------------------------
 */
-GdkPixbuf* Tile::getBuffer()
+cairo_surface_t* Tile::getBuffer()
 {
     return m_pBuffer;
 }
 
-void Tile::setPixbuf(GdkPixbuf *buffer)
+void Tile::setSurface(cairo_surface_t *buffer)
 {
     if (m_pBuffer == buffer)
         return;
-    g_clear_object(&m_pBuffer);
+    if (m_pBuffer)
+        cairo_surface_destroy(m_pBuffer);
     if (buffer != nullptr)
-        g_object_ref(buffer);
+        cairo_surface_reference(buffer);
     m_pBuffer = buffer;
 }