Make display list struct opaque.

2 files changed, 52 insertions, 51 deletions

diff --git a/fitz/dev_list.c b/fitz/dev_list.c
index fc9342fc..eeb4e485 100644
--- a/fitz/dev_list.c
+++ b/fitz/dev_list.c
@@ -1,5 +1,57 @@
 #include "fitz.h"
 
+typedef struct fz_display_node_s fz_display_node;
+
+typedef enum fz_display_command_e
+{
+	FZ_CMD_FILL_PATH,
+	FZ_CMD_STROKE_PATH,
+	FZ_CMD_CLIP_PATH,
+	FZ_CMD_CLIP_STROKE_PATH,
+	FZ_CMD_FILL_TEXT,
+	FZ_CMD_STROKE_TEXT,
+	FZ_CMD_CLIP_TEXT,
+	FZ_CMD_CLIP_STROKE_TEXT,
+	FZ_CMD_IGNORE_TEXT,
+	FZ_CMD_FILL_SHADE,
+	FZ_CMD_FILL_IMAGE,
+	FZ_CMD_FILL_IMAGE_MASK,
+	FZ_CMD_CLIP_IMAGE_MASK,
+	FZ_CMD_POP_CLIP,
+	FZ_CMD_BEGIN_MASK,
+	FZ_CMD_END_MASK,
+	FZ_CMD_BEGIN_GROUP,
+	FZ_CMD_END_GROUP,
+	FZ_CMD_BEGIN_TILE,
+	FZ_CMD_END_TILE
+} fz_display_command;
+
+struct fz_display_node_s
+{
+	fz_display_command cmd;
+	fz_display_node *next;
+	fz_rect rect;
+	union {
+		fz_path *path;
+		fz_text *text;
+		fz_shade *shade;
+		fz_pixmap *image;
+		int blendmode;
+	} item;
+	fz_stroke_state *stroke;
+	int flag; /* even_odd, accumulate, isolated/knockout... */
+	fz_matrix ctm;
+	fz_colorspace *colorspace;
+	float alpha;
+	float color[FZ_MAX_COLORS];
+};
+
+struct fz_display_list_s
+{
+	fz_display_node *first;
+	fz_display_node *last;
+};
+
 enum { ISOLATED = 1, KNOCKOUT = 2 };
 
 static fz_display_node *
diff --git a/fitz/fitz.h b/fitz/fitz.h
index b1578b20..399c7665 100644
--- a/fitz/fitz.h
+++ b/fitz/fitz.h
@@ -1036,57 +1036,6 @@ fz_device *fz_new_text_device(fz_text_span *text);
  */
 
 typedef struct fz_display_list_s fz_display_list;
-typedef struct fz_display_node_s fz_display_node;
-
-typedef enum fz_display_command_e
-{
-	FZ_CMD_FILL_PATH,
-	FZ_CMD_STROKE_PATH,
-	FZ_CMD_CLIP_PATH,
-	FZ_CMD_CLIP_STROKE_PATH,
-	FZ_CMD_FILL_TEXT,
-	FZ_CMD_STROKE_TEXT,
-	FZ_CMD_CLIP_TEXT,
-	FZ_CMD_CLIP_STROKE_TEXT,
-	FZ_CMD_IGNORE_TEXT,
-	FZ_CMD_FILL_SHADE,
-	FZ_CMD_FILL_IMAGE,
-	FZ_CMD_FILL_IMAGE_MASK,
-	FZ_CMD_CLIP_IMAGE_MASK,
-	FZ_CMD_POP_CLIP,
-	FZ_CMD_BEGIN_MASK,
-	FZ_CMD_END_MASK,
-	FZ_CMD_BEGIN_GROUP,
-	FZ_CMD_END_GROUP,
-	FZ_CMD_BEGIN_TILE,
-	FZ_CMD_END_TILE
-} fz_display_command;
-
-struct fz_display_node_s
-{
-	fz_display_command cmd;
-	fz_display_node *next;
-	fz_rect rect;
-	union {
-		fz_path *path;
-		fz_text *text;
-		fz_shade *shade;
-		fz_pixmap *image;
-		int blendmode;
-	} item;
-	fz_stroke_state *stroke;
-	int flag; /* even_odd, accumulate, isolated/knockout... */
-	fz_matrix ctm;
-	fz_colorspace *colorspace;
-	float alpha;
-	float color[FZ_MAX_COLORS];
-};
-
-struct fz_display_list_s
-{
-	fz_display_node *first;
-	fz_display_node *last;
-};
 
 fz_display_list *fz_new_display_list(void);
 void fz_free_display_list(fz_display_list *list);