commit fe24f58297b4fb7bad94a5bad1593f12a764356c
parent 6a13f3eb385c5d6b82a3e23b6345e47848916676
Author: Drew DeVault <sir@cmpwn.com>
Date: Wed, 16 May 2018 12:27:11 -0400
Merge pull request #1995 from RedSoxFan/fix-1985
Change scale from int32_t to double for pango
Diffstat:
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/common/pango.c b/common/pango.c
@@ -71,7 +71,7 @@ int escape_markup_text(const char *src, char *dest, int dest_length) {
}
PangoLayout *get_pango_layout(cairo_t *cairo, const char *font,
- const char *text, int32_t scale, bool markup) {
+ const char *text, double scale, bool markup) {
PangoLayout *layout = pango_cairo_create_layout(cairo);
PangoAttrList *attrs;
if (markup) {
@@ -103,7 +103,7 @@ PangoLayout *get_pango_layout(cairo_t *cairo, const char *font,
}
void get_text_size(cairo_t *cairo, const char *font, int *width, int *height,
- int32_t scale, bool markup, const char *fmt, ...) {
+ double scale, bool markup, const char *fmt, ...) {
static char buf[2048];
va_list args;
@@ -120,7 +120,7 @@ void get_text_size(cairo_t *cairo, const char *font, int *width, int *height,
}
void pango_printf(cairo_t *cairo, const char *font,
- int32_t scale, bool markup, const char *fmt, ...) {
+ double scale, bool markup, const char *fmt, ...) {
static char buf[2048];
va_list args;
diff --git a/include/pango.h b/include/pango.h
@@ -18,10 +18,10 @@
*/
int escape_markup_text(const char *src, char *dest, int dest_length);
PangoLayout *get_pango_layout(cairo_t *cairo, const char *font,
- const char *text, int32_t scale, bool markup);
+ const char *text, double scale, bool markup);
void get_text_size(cairo_t *cairo, const char *font, int *width, int *height,
- int32_t scale, bool markup, const char *fmt, ...);
+ double scale, bool markup, const char *fmt, ...);
void pango_printf(cairo_t *cairo, const char *font,
- int32_t scale, bool markup, const char *fmt, ...);
+ double scale, bool markup, const char *fmt, ...);
#endif