console: remove cairo from header
There is no reason to make all tests/* apps need cairo dependencies. We pass this parameter internally so we can safely use void*. Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
This commit is contained in:
parent
10dfb530d4
commit
f7eca00957
@ -35,7 +35,6 @@
|
|||||||
* of it.
|
* of it.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <cairo.h>
|
|
||||||
#include <inttypes.h>
|
#include <inttypes.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
|
|
||||||
@ -65,7 +64,7 @@ void kmscon_font_ref(struct kmscon_font *font);
|
|||||||
void kmscon_font_unref(struct kmscon_font *font);
|
void kmscon_font_unref(struct kmscon_font *font);
|
||||||
|
|
||||||
int kmscon_font_draw(struct kmscon_font *font, const struct kmscon_char *ch,
|
int kmscon_font_draw(struct kmscon_font *font, const struct kmscon_char *ch,
|
||||||
cairo_t *cr, uint32_t x, uint32_t y);
|
void *dcr, uint32_t x, uint32_t y);
|
||||||
|
|
||||||
/* console buffer with cell objects */
|
/* console buffer with cell objects */
|
||||||
|
|
||||||
|
@ -576,10 +576,11 @@ err_char:
|
|||||||
* Returns 0 on success.
|
* Returns 0 on success.
|
||||||
*/
|
*/
|
||||||
int kmscon_font_draw(struct kmscon_font *font, const struct kmscon_char *ch,
|
int kmscon_font_draw(struct kmscon_font *font, const struct kmscon_char *ch,
|
||||||
cairo_t *cr, uint32_t x, uint32_t y)
|
void *dcr, uint32_t x, uint32_t y)
|
||||||
{
|
{
|
||||||
struct kmscon_glyph *glyph;
|
struct kmscon_glyph *glyph;
|
||||||
int ret;
|
int ret;
|
||||||
|
cairo_t *cr = dcr;
|
||||||
|
|
||||||
if (!font || !ch || !cr)
|
if (!font || !ch || !cr)
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user