fix missing includes from header API changes

This commit is contained in:
Vincent Sanders 2016-05-30 21:21:09 +01:00
parent 667605869f
commit aa53519bcd
4 changed files with 11 additions and 6 deletions

View File

@ -113,7 +113,7 @@ typedef enum {
/** /**
* Plot style for stroke/fill plotters * Plot style for stroke/fill plotters
*/ */
typedef struct { typedef struct plot_style_s {
plot_operation_type_t stroke_type; /**< Stroke plot type */ plot_operation_type_t stroke_type; /**< Stroke plot type */
int stroke_width; /**< Width of stroke, in pixels */ int stroke_width; /**< Width of stroke, in pixels */
colour stroke_colour; /**< Colour of stroke */ colour stroke_colour; /**< Colour of stroke */

View File

@ -54,6 +54,8 @@
#define ERR_NO_MEM 2 /* Not enough memory for requested operation */ #define ERR_NO_MEM 2 /* Not enough memory for requested operation */
#define ERR_PLOTTER_NOT_AVAILABLE 3 /* invalid plotter driver name passed */ #define ERR_PLOTTER_NOT_AVAILABLE 3 /* invalid plotter driver name passed */
struct plot_style_s;
struct s_vdi_sysinfo { struct s_vdi_sysinfo {
short vdi_handle; /**< vdi handle */ short vdi_handle; /**< vdi handle */
short scr_w; /**< resolution horz. */ short scr_w; /**< resolution horz. */
@ -104,8 +106,8 @@ void plot_get_clip_grect(GRECT * out);
bool plot_clip(const struct rect *clip); bool plot_clip(const struct rect *clip);
VdiHdl plot_get_vdi_handle(void); VdiHdl plot_get_vdi_handle(void);
long plot_get_flags(void); long plot_get_flags(void);
bool plot_rectangle( int x0, int y0, int x1, int y1,const plot_style_t *style ); bool plot_rectangle( int x0, int y0, int x1, int y1,const struct plot_style_s *style );
bool plot_line( int x0, int y0, int x1, int y1, const plot_style_t *style ); bool plot_line( int x0, int y0, int x1, int y1, const struct plot_style_s *style );
bool plot_blit_bitmap(struct bitmap * bmp, int x, int y, bool plot_blit_bitmap(struct bitmap * bmp, int x, int y,
unsigned long bg, unsigned long flags); unsigned long bg, unsigned long flags);
bool plot_blit_mfdb(GRECT * loc, MFDB * insrc, short fgcolor, uint32_t flags); bool plot_blit_mfdb(GRECT * loc, MFDB * insrc, short fgcolor, uint32_t flags);

View File

@ -19,6 +19,8 @@
#ifndef NETSURF_FB_FBTK_H #ifndef NETSURF_FB_FBTK_H
#define NETSURF_FB_FBTK_H #define NETSURF_FB_FBTK_H
#include "desktop/plot_style.h"
#ifdef FBTK_LOGGING #ifdef FBTK_LOGGING
#define FBTK_LOG(x) LOG(x) #define FBTK_LOG(x) LOG(x)
#else #else

View File

@ -17,18 +17,19 @@
*/ */
#include <stdbool.h> #include <stdbool.h>
#include <stdint.h>
#include "utils/config.h" #include "utils/config.h"
#include <windows.h> #include <windows.h>
#include <windowsx.h> #include <windowsx.h>
#include "netsurf/browser_window.h"
#include "desktop/textinput.h"
#include "netsurf/plotters.h"
#include "utils/errors.h" #include "utils/errors.h"
#include "utils/log.h" #include "utils/log.h"
#include "utils/utils.h" #include "utils/utils.h"
#include "netsurf/browser_window.h"
#include "netsurf/plotters.h"
#include "desktop/textinput.h"
#include "windows/windbg.h" #include "windows/windbg.h"
#include "windows/plot.h" #include "windows/plot.h"