Do all svp text rendering with cairo

Desktop / LibreOffice - Caolán McNamara [redhat.com] - 23 November 2015 08:25 UTC

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.

b0f5416 Do all svp text rendering with cairo
desktop/source/lib/init.cxx | 12 +-
external/cairo/UnpackedTarball_cairo.mk | 1 +
external/cairo/cairo/cairo.GL_RGBA.patch | 41 +++
libreofficekit/source/gtk/lokdocview.cxx | 22 +-
libreofficekit/source/gtk/tilebuffer.cxx | 9 +-
libreofficekit/source/gtk/tilebuffer.hxx | 17 +-
vcl/Library_vcl.mk | 6 +-
vcl/Library_vclplug_gtk3.mk | 1 -
vcl/generic/glyphs/gcach_ftyp.cxx | 272 ----------------
vcl/generic/glyphs/gcach_rbmp.cxx | 251 ---------------
vcl/headless/svpcairotextrender.cxx | 63 ++++
vcl/headless/svpcairotextrender.hxx | 36 +++
vcl/headless/svpgdi.cxx | 31 +-
vcl/headless/svpglyphcache.cxx | 71 ++++
vcl/headless/svpinst.cxx | 28 +-
vcl/headless/svptextrender.cxx | 500 -----------------------------
vcl/headless/svpvd.cxx | 7 -
vcl/inc/cairotextrender.hxx | 8 +
vcl/inc/generic/glyphcache.hxx | 29 --
vcl/inc/headless/svpbmp.hxx | 2 -
vcl/inc/headless/svpgdi.hxx | 11 +
vcl/inc/headless/svpinst.hxx | 10 -
vcl/inc/headless/svptextrender.hxx | 85 -----
vcl/unx/generic/gdi/cairotextrender.cxx | 2 +
vcl/unx/gtk/gtksalframe.cxx | 2 +-
vcl/unx/gtk3/gtk3cairotextrender.cxx | 43 ---
vcl/unx/gtk3/gtk3cairotextrender.hxx | 34 --
vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx | 3 -
28 files changed, 296 insertions(+), 1301 deletions(-)

Upstream: cgit.freedesktop.org

  • Share