Commit: 1bbfa0abd64dae16f5e5872ea6d8c902baeae414 - dia (git)

作図ソフト dia の改良版

Commit MetaInfo

• Révision: 1bbfa0abd64dae16f5e5872ea6d8c902baeae414 (tree)
• l'heure: 2014-10-04 18:54:25
• Auteur: Hans Breuer <hans@breu...>
• Commiter: Hans Breuer

Message de Log

[warningectomy] no previous prototype for function 'path_combine'

Add one more single function header.

Change Summary

• modified: lib/Makefile.am
• modified: lib/diapathrenderer.c
• modified: lib/diapathrenderer.h
• modified: lib/path-math.c
• add: lib/path-math.h

Modification

--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -171,6 +171,7 @@ libdia_la_SOURCES =  \
 		diagdkrenderer.c \
 		diapathrenderer.h \
 		diapathrenderer.c \
+		path-math.h \
 		path-math.c \
 		diapatternselector.h \
 		diapatternselector.c \

--- a/lib/diapathrenderer.c
+++ b/lib/diapathrenderer.c
@@ -777,6 +777,7 @@ dia_path_renderer_class_init (DiaPathRendererClass *klass)
 #include "object.h"
 #include "create.h"
 #include "group.h"
+#include "path-math.h" /* path_combine() */
 
 /*!
  * \brief Convert an object to a _StdPath by rendering it with _DiaPathRenderer
@@ -892,3 +893,4 @@ create_standard_path_from_list (GList           *objects,
   g_array_free (p1, TRUE);
   return path;
 }
+

--- a/lib/diapathrenderer.h
+++ b/lib/diapathrenderer.h
@@ -48,6 +48,6 @@ void path_build_ellipse (GArray *path,
 			 real width, real height);
 
 /* in path-math.c */
-GArray *path_combine (const GArray *p1, const GArray *p2, PathCombineMode mode);
 
 #endif
+

--- a/lib/path-math.c
+++ b/lib/path-math.c
@@ -22,6 +22,7 @@
 
 #include "geometry.h"
 #include "boundingbox.h"
+#include "path-math.h"
 
 #include <string.h> /* memcmp() */
 
@@ -848,3 +849,4 @@ path_combine (const GArray   *p1,
   }
   return result;
 }
+

--- /dev/null
+++ b/lib/path-math.h
@@ -0,0 +1,29 @@
+/* Dia -- an diagram creation/manipulation program
+ * Copyright (C) 1998 Alexander Larsson
+ *
+ * path-math.c -- some helper function for binary path operations
+ * Copyright (C) 2014, Hans Breuer <[e-mail]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+#ifndef DIA_PATH_MATH_H
+#define DIA_PATH_MATH_H
+
+#include <glib.h>
+
+GArray *path_combine (const GArray *p1, const GArray *p2, PathCombineMode mode);
+
+#endif
+