From e22323c4d9dd9f34af93530fcffbf3581ab84744 Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Sun, 1 Apr 2012 21:54:03 -0700 Subject: [PATCH] Function rename + palette alloc test. --- libguac/include/palette.h | 4 ++-- libguac/src/palette.c | 6 +++--- libguac/src/protocol.c | 10 +++++++++- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/libguac/include/palette.h b/libguac/include/palette.h index ed210a08..fc3cc3dd 100644 --- a/libguac/include/palette.h +++ b/libguac/include/palette.h @@ -55,8 +55,8 @@ typedef struct guac_palette { } guac_palette; -guac_palette* __guac_create_palette(cairo_surface_t* surface); -void __guac_free_palette(guac_palette* palette); +guac_palette* guac_palette_alloc(cairo_surface_t* surface); +void guac_palette_free(guac_palette* palette); #endif diff --git a/libguac/src/palette.c b/libguac/src/palette.c index 4672b574..2add6b1a 100644 --- a/libguac/src/palette.c +++ b/libguac/src/palette.c @@ -47,7 +47,7 @@ #include "palette.h" -guac_palette* __guac_create_palette(cairo_surface_t* surface) { +guac_palette* guac_palette_alloc(cairo_surface_t* surface) { int x, y; @@ -81,7 +81,7 @@ guac_palette* __guac_create_palette(cairo_surface_t* surface) { /* Stop if already at capacity */ if (palette->colors == 256) { - __guac_free_palette(palette); + guac_palette_free(palette); return NULL; } @@ -111,7 +111,7 @@ guac_palette* __guac_create_palette(cairo_surface_t* surface) { } -void __guac_free_palette(guac_palette* palette) { +void guac_palette_free(guac_palette* palette) { free(palette); } diff --git a/libguac/src/protocol.c b/libguac/src/protocol.c index 7f2d7a4d..fffce3fa 100644 --- a/libguac/src/protocol.c +++ b/libguac/src/protocol.c @@ -227,7 +227,15 @@ int __guac_socket_write_length_png(guac_socket* socket, cairo_surface_t* surface cairo_surface_flush(surface); if (format == CAIRO_FORMAT_RGB24) { - __guac_create_palette(surface); + + guac_palette* palette = guac_palette_alloc(surface); + if (palette != NULL) { + fprintf(stderr, + "Created palette with %i entries.\n", + palette->colors); + guac_palette_free(palette); + } + png_rows = __guac_create_png_rgb(surface, 0); png_format = PNG_COLOR_TYPE_RGB; }