[gimp] libgimpmath: move the GipmVector and GimpMatrix structs to gimpmathtypes.h



commit b2aad5ef14be0828a56756b492b4018635551d48
Author: Michael Natterer <mitch gimp org>
Date:   Thu Apr 28 13:25:25 2011 +0200

    libgimpmath: move the GipmVector and GimpMatrix structs to gimpmathtypes.h
    
    in order to get rid of the need to include gimpvector.h and
    gimpmatrix.h in global places just to make the structs generally
    known.

 libgimpmath/gimpmathtypes.h |   74 +++++++++++++++++++++++++++++++++++++++++++
 libgimpmath/gimpmatrix.h    |   33 -------------------
 libgimpmath/gimpvector.h    |   39 ----------------------
 3 files changed, 74 insertions(+), 72 deletions(-)
---
diff --git a/libgimpmath/gimpmathtypes.h b/libgimpmath/gimpmathtypes.h
index cc6aeb0..03478f5 100644
--- a/libgimpmath/gimpmathtypes.h
+++ b/libgimpmath/gimpmathtypes.h
@@ -27,10 +27,84 @@ typedef struct _GimpMatrix2 GimpMatrix2;
 typedef struct _GimpMatrix3 GimpMatrix3;
 typedef struct _GimpMatrix4 GimpMatrix4;
 
+/**
+ * GimpMatrix2
+ * @coeff: the coefficients
+ *
+ * A two by two matrix.
+ **/
+struct _GimpMatrix2
+{
+  gdouble coeff[2][2];
+};
+
+/**
+ * GimpMatrix3
+ * @coeff: the coefficients
+ *
+ * A three by three matrix.
+ **/
+struct _GimpMatrix3
+{
+  gdouble coeff[3][3];
+};
+
+/**
+ * GimpMatrix4
+ * @coeff: the coefficients
+ *
+ * A four by four matrix.
+ **/
+struct _GimpMatrix4
+{
+  gdouble coeff[4][4];
+};
+
+
 typedef struct _GimpVector2 GimpVector2;
 typedef struct _GimpVector3 GimpVector3;
 typedef struct _GimpVector4 GimpVector4;
 
+/**
+ * GimpVector2:
+ * @x: the x axis
+ * @y: the y axis
+ *
+ * A two dimensional vector.
+ **/
+struct _GimpVector2
+{
+  gdouble x, y;
+};
+
+/**
+ * GimpVector3:
+ * @x: the x axis
+ * @y: the y axis
+ * @z: the z axis
+ *
+ * A three dimensional vector.
+ **/
+struct _GimpVector3
+{
+  gdouble x, y, z;
+};
+
+/**
+ * GimpVector4:
+ * @x: the x axis
+ * @y: the y axis
+ * @z: the z axis
+ * @w: the w axis
+ *
+ * A four dimensional vector.
+ **/
+struct _GimpVector4
+{
+  gdouble x, y, z, w;
+};
+
+
 G_END_DECLS
 
 #endif /* __GIMP_MATH_TYPES_H__ */
diff --git a/libgimpmath/gimpmatrix.h b/libgimpmath/gimpmatrix.h
index 2b36bc2..a2c0e41 100644
--- a/libgimpmath/gimpmatrix.h
+++ b/libgimpmath/gimpmatrix.h
@@ -26,39 +26,6 @@ G_BEGIN_DECLS
 
 /* For information look into the C source or the html documentation */
 
-/**
- * GimpMatrix2
- * @coeff: the coefficients
- *
- * A two by two matrix.
- **/
-struct _GimpMatrix2
-{
-  gdouble coeff[2][2];
-};
-
-/**
- * GimpMatrix3
- * @coeff: the coefficients
- *
- * A three by three matrix.
- **/
-struct _GimpMatrix3
-{
-  gdouble coeff[3][3];
-};
-
-/**
- * GimpMatrix4
- * @coeff: the coefficients
- *
- * A four by four matrix.
- **/
-struct _GimpMatrix4
-{
-  gdouble coeff[4][4];
-};
-
 
 /*****************/
 /*  GimpMatrix2  */
diff --git a/libgimpmath/gimpvector.h b/libgimpmath/gimpvector.h
index 7f77327..3a719a6 100644
--- a/libgimpmath/gimpvector.h
+++ b/libgimpmath/gimpvector.h
@@ -29,45 +29,6 @@ G_BEGIN_DECLS
 
 /* For information look into the C source or the html documentation */
 
-/**
- * GimpVector2:
- * @x: the x axis
- * @y: the y axis
- *
- * A two dimensional vector.
- **/
-struct _GimpVector2
-{
-  gdouble x, y;
-};
-
-/**
- * GimpVector3:
- * @x: the x axis
- * @y: the y axis
- * @z: the z axis
- *
- * A three dimensional vector.
- **/
-struct _GimpVector3
-{
-  gdouble x, y, z;
-};
-
-/**
- * GimpVector4:
- * @x: the x axis
- * @y: the y axis
- * @z: the z axis
- * @w: the w axis
- *
- * A four dimensional vector.
- **/
-struct _GimpVector4
-{
-  gdouble x, y, z, w;
-};
-
 
 /* Two dimensional vector functions */
 /* ================================ */



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]