From a804e3491c0d8056742855eb8d840f8c4ee1a49f Mon Sep 17 00:00:00 2001
From: Sebastian Rasmussen <sebras@gmail.com>
Date: Sat, 15 Oct 2016 01:54:56 +0800
Subject: Move headers to make svg_document an internal type.

---
 include/mupdf/svg.h    | 39 ---------------------------------------
 source/svg/svg-color.c |  3 ++-
 source/svg/svg-doc.c   |  3 ++-
 source/svg/svg-imp.h   | 35 +++++++++++++++++++++++++++++++++++
 source/svg/svg-parse.c |  3 ++-
 source/svg/svg-run.c   |  3 ++-
 6 files changed, 43 insertions(+), 43 deletions(-)
 create mode 100644 source/svg/svg-imp.h

diff --git a/include/mupdf/svg.h b/include/mupdf/svg.h
index d95f7ea7..7d166906 100644
--- a/include/mupdf/svg.h
+++ b/include/mupdf/svg.h
@@ -1,45 +1,6 @@
 #ifndef MUPDF_SVG_H
 #define MUPDF_SVG_H
 
-#include "mupdf/fitz.h"
-
-/* Forward declarations. */
-
-typedef struct svg_document_s svg_document;
-
-/* Parse basic data type units. */
-
-const char *svg_lex_number(float *fp, const char *str);
-float svg_parse_number(const char *str, float min,float max, float inherit);
-float svg_parse_length(const char *str, float percent, float font_size);
-float svg_parse_angle(const char *str);
-
-void svg_parse_color(fz_context *ctx, svg_document *doc, char *str, float *rgb);
-void svg_parse_transform(fz_context *ctx, svg_document *doc, char *str, fz_matrix *ctm);
-
-int svg_is_whitespace_or_comma(int c);
-int svg_is_whitespace(int c);
-int svg_is_alpha(int c);
-int svg_is_digit(int c);
-
-/* Graphics content parsing. */
-
-void svg_parse_document_bounds(fz_context *ctx, svg_document *doc, fz_xml *root);
-void svg_run_document(fz_context *ctx, svg_document *doc, fz_xml *root, fz_device *dev, const fz_matrix *ctm);
-
-/* Global context */
-
-struct svg_document_s
-{
-	fz_document super;
-	fz_xml *root;
-	fz_tree *idmap;
-	float width;
-	float height;
-};
-
-/* Utility functions */
-
 fz_display_list *fz_new_display_list_from_svg(fz_context *ctx, fz_buffer *buf, float *w, float *h);
 fz_image *fz_new_image_from_svg(fz_context *ctx, fz_buffer *buf);
 
diff --git a/source/svg/svg-color.c b/source/svg/svg-color.c
index 4f6031e7..d1139475 100644
--- a/source/svg/svg-color.c
+++ b/source/svg/svg-color.c
@@ -1,4 +1,5 @@
-#include "mupdf/svg.h"
+#include "mupdf/fitz.h"
+#include "svg-imp.h"
 
 /* Color keywords (white, blue, fuchsia)
  * System color keywords (ActiveBorder, ButtonFace -- need to find reasonable defaults)
diff --git a/source/svg/svg-doc.c b/source/svg/svg-doc.c
index fa2b3d19..5f7f809b 100644
--- a/source/svg/svg-doc.c
+++ b/source/svg/svg-doc.c
@@ -1,4 +1,5 @@
-#include "mupdf/svg.h"
+#include "mupdf/fitz.h"
+#include "svg-imp.h"
 
 typedef struct svg_page_s svg_page;
 
diff --git a/source/svg/svg-imp.h b/source/svg/svg-imp.h
new file mode 100644
index 00000000..419e66b9
--- /dev/null
+++ b/source/svg/svg-imp.h
@@ -0,0 +1,35 @@
+#ifndef MUPDF_SVG_IMP_H
+#define MUPDF_SVG_IMP_H
+
+typedef struct svg_document_s svg_document;
+
+struct svg_document_s
+{
+	fz_document super;
+	fz_xml *root;
+	fz_tree *idmap;
+	float width;
+	float height;
+};
+
+/* Parse basic data type units. */
+
+const char *svg_lex_number(float *fp, const char *str);
+float svg_parse_number(const char *str, float min,float max, float inherit);
+float svg_parse_length(const char *str, float percent, float font_size);
+float svg_parse_angle(const char *str);
+
+void svg_parse_color(fz_context *ctx, svg_document *doc, char *str, float *rgb);
+void svg_parse_transform(fz_context *ctx, svg_document *doc, char *str, fz_matrix *ctm);
+
+int svg_is_whitespace_or_comma(int c);
+int svg_is_whitespace(int c);
+int svg_is_alpha(int c);
+int svg_is_digit(int c);
+
+/* Graphics content parsing. */
+
+void svg_parse_document_bounds(fz_context *ctx, svg_document *doc, fz_xml *root);
+void svg_run_document(fz_context *ctx, svg_document *doc, fz_xml *root, fz_device *dev, const fz_matrix *ctm);
+
+#endif
diff --git a/source/svg/svg-parse.c b/source/svg/svg-parse.c
index defdeb75..0a066ed1 100644
--- a/source/svg/svg-parse.c
+++ b/source/svg/svg-parse.c
@@ -1,4 +1,5 @@
-#include "mupdf/svg.h"
+#include "mupdf/fitz.h"
+#include "svg-imp.h"
 
 int svg_is_whitespace_or_comma(int c)
 {
diff --git a/source/svg/svg-run.c b/source/svg/svg-run.c
index e05096ae..f3860d76 100644
--- a/source/svg/svg-run.c
+++ b/source/svg/svg-run.c
@@ -1,4 +1,5 @@
-#include "mupdf/svg.h"
+#include "mupdf/fitz.h"
+#include "svg-imp.h"
 
 /* default page size */
 #define DEF_WIDTH 12
-- 
cgit v1.2.3