No more NRMatrix or NRPoint.

[inkscape.git] / src / svg / svg.h

diff --git a/src/svg/svg.h b/src/svg/svg.h
index 601c0b112c528ee6aacf21564c4f70eada7c8eeb..4b2dea9940e975a3474f2cc4b6a32fcf5efff838 100644 (file)
--- a/src/svg/svg.h
+++ b/src/svg/svg.h
@@ -12,14 +12,12 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 #include <glib/gtypes.h>
-#include "svg/svg-length.h"
 #include <vector>
+#include <cstring>
+#include <string>
 
-struct NArtBpath;
-struct NRMatrix;
-namespace NR {
-    class Matrix;
-}
+#include "svg/svg-length.h"
+#include "libnr/nr-forward.h"
 
 /* Generic */
 
@@ -36,7 +34,7 @@ unsigned int sp_svg_number_read_d (const gchar *str, double *val);
 /*
  * No buffer overflow checking is done, so better wrap them if needed
  */
-unsigned int sp_svg_number_write_de (gchar *buf, double val, unsigned int tprec, unsigned int padf);
+unsigned int sp_svg_number_write_de (gchar *buf, double val, unsigned int tprec, int min_exp, unsigned int padf);
 
 /* Length */
 
@@ -57,14 +55,11 @@ std::string sp_svg_length_write_with_units(SVGLength const &length);
 
 bool sp_svg_transform_read(gchar const *str, NR::Matrix *transform);
 
-unsigned sp_svg_transform_write(gchar str[], unsigned size, NR::Matrix const &transform);
-unsigned sp_svg_transform_write(gchar str[], unsigned size, NRMatrix const *transform);
+gchar *sp_svg_transform_write(NR::Matrix const &transform);
+gchar *sp_svg_transform_write(NR::Matrix const *transform);
 
 double sp_svg_read_percentage (const char * str, double def);
 
-unsigned int sp_svg_read_color (const gchar * str, unsigned int def);
-int sp_svg_write_color (char * buf, int buflen, unsigned int color);
-
 /* NB! As paths can be long, we use here dynamic string */
 
 NArtBpath * sp_svg_read_path (const char * str);