Commit b2aad5ef authored by Michael Natterer's avatar Michael Natterer

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.
parent 3d7e51c5
......@@ -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__ */
......@@ -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 */
......
......@@ -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 */
/* ================================ */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment