From 4e8c5287ede323c0d79f27b5cfd470f962abf2ec Mon Sep 17 00:00:00 2001 From: Pere Pujal i Carabantes Date: Tue, 17 Mar 2015 00:10:07 +0100 Subject: [PATCH] Adding support for sdl2pango, Thanks Jianwei Zhang --- src/fonts.c | 28 +++++++++++++++++++++++++++- src/fonts.h | 2 +- 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/src/fonts.c b/src/fonts.c index 7f0dbcae9..cce8c2787 100644 --- a/src/fonts.c +++ b/src/fonts.c @@ -118,7 +118,7 @@ SDL_Thread *font_thread; #ifndef NO_SDLPANGO -#include "SDL_Pango.h" +#include "SDL2_Pango.h" #if !defined(SDL_PANGO_H) #error "---------------------------------------------------" #error "If you installed SDL_Pango from a package, be sure" @@ -1622,6 +1622,32 @@ const char *TuxPaint_Font_FontFaceStyleName(TuxPaint_Font * tpf) #ifndef NO_SDLPANGO +void ssdl_color_to_pango_color(SDL_Color sdl_color, SDLPango_Matrix * pango_color) +{ + Uint8 pc[4][4]; + + pc[0][0] = 0; + pc[1][0] = 0; + pc[2][0] = 0; + pc[3][0] = 0; + + pc[0][1] = 0; + pc[1][1] = 0; + pc[2][1] = 0; + pc[3][1] = 0; + + pc[0][2] = 0; + pc[1][2] = 0; + pc[2][2] = 0; + pc[3][2] = 0; + + pc[0][3] = 0; + pc[1][3] = 0; + pc[2][3] = 0; + pc[3][3] = 0; + + memcpy(pango_color, pc, 16); +} void sdl_color_to_pango_color(SDL_Color sdl_color, SDLPango_Matrix * pango_color) { Uint8 pc[4][4]; diff --git a/src/fonts.h b/src/fonts.h index 5228724d7..4b4b1d553 100644 --- a/src/fonts.h +++ b/src/fonts.h @@ -40,7 +40,7 @@ #include "SDL_ttf.h" #ifndef NO_SDLPANGO -#include "SDL_Pango.h" +#include "SDL2_Pango.h" #endif #define PANGO_DEFAULT_FONT "BitStream Vera"