adg-adim.h   adg-adim.h 
skipping to change at line 65 skipping to change at line 65
AdgADim * adg_adim_new_full_explicit (gdouble ref1_x, AdgADim * adg_adim_new_full_explicit (gdouble ref1_x,
gdouble ref1_y, gdouble ref1_y,
gdouble ref2_x, gdouble ref2_x,
gdouble ref2_y, gdouble ref2_y,
gdouble org1_x, gdouble org1_x,
gdouble org1_y, gdouble org1_y,
gdouble org2_x, gdouble org2_x,
gdouble org2_y, gdouble org2_y,
gdouble pos_x, gdouble pos_x,
gdouble pos_y); gdouble pos_y);
AdgADim * adg_adim_new_full_from_model (AdgModel *model,
const gchar *ref1,
const gchar *ref2,
const gchar *org1,
const gchar *org2,
const gchar *pos);
const AdgPair * adg_adim_get_org1 (AdgADim *adim); const AdgPair * adg_adim_get_org1 (AdgADim *adim);
const AdgPair * adg_adim_get_org2 (AdgADim *adim); const AdgPair * adg_adim_get_org2 (AdgADim *adim);
void adg_adim_set_org (AdgADim *adim, void adg_adim_set_org (AdgADim *adim,
const AdgPair *org1, const AdgPair *org1,
const AdgPair *org2); const AdgPair *org2);
void adg_adim_set_org_explicit (AdgADim *adim,
gdouble org1_x,
gdouble org1_y,
gdouble org2_x,
gdouble org2_y);
void adg_adim_set_org_from_model (AdgADim *adim,
AdgModel *model,
const gchar *org1,
const gchar *org2);
G_END_DECLS G_END_DECLS
#endif /* __ADG_ADIM_H__ */ #endif /* __ADG_ADIM_H__ */
 End of changes. 2 change blocks. 
0 lines changed or deleted 15 lines changed or added


 adg-dim.h   adg-dim.h 
skipping to change at line 55 skipping to change at line 55
struct _AdgDimClass { struct _AdgDimClass {
/*< private >*/ /*< private >*/
AdgEntityClass parent_class; AdgEntityClass parent_class;
/*< public >*/ /*< public >*/
/* Virtual Table */ /* Virtual Table */
gdouble (*quote_angle) (gdouble angle); gdouble (*quote_angle) (gdouble angle);
gchar * (*default_value) (AdgDim *dim); gchar * (*default_value) (AdgDim *dim);
}; };
GType adg_dim_get_type (void) G_GNUC_CONST; GType adg_dim_get_type (void) G_GNUC_CONST;
AdgDress adg_dim_get_dress (AdgDim *dim); AdgDress adg_dim_get_dim_dress (AdgDim *dim);
void adg_dim_set_dress (AdgDim *dim, void adg_dim_set_dim_dress (AdgDim *dim,
AdgDress dress); AdgDress dress);
const AdgPair * adg_dim_get_ref1 (AdgDim *dim); const AdgPair * adg_dim_get_ref1 (AdgDim *dim);
const AdgPair * adg_dim_get_ref2 (AdgDim *dim); const AdgPair * adg_dim_get_ref2 (AdgDim *dim);
void adg_dim_set_ref (AdgDim *dim, void adg_dim_set_ref (AdgDim *dim,
const AdgPair *ref1, const AdgPair *ref1,
const AdgPair *ref2); const AdgPair *ref2);
void adg_dim_set_ref_explicit (AdgDim *dim, void adg_dim_set_ref_explicit (AdgDim *dim,
gdouble ref1_x, gdouble ref1_x,
gdouble ref1_y, gdouble ref1_y,
gdouble ref2_x, gdouble ref2_x,
gdouble ref2_y); gdouble ref2_y);
void adg_dim_set_ref_from_model (AdgDim *dim,
AdgModel *model,
const gchar *ref1,
const gchar *ref2);
const AdgPair * adg_dim_get_pos (AdgDim *dim); const AdgPair * adg_dim_get_pos (AdgDim *dim);
void adg_dim_set_pos (AdgDim *dim, void adg_dim_set_pos (AdgDim *dim,
const AdgPair *pos); const AdgPair *pos);
void adg_dim_set_pos_explicit (AdgDim *dim, void adg_dim_set_pos_explicit (AdgDim *dim,
gdouble x, gdouble x,
gdouble y); gdouble y);
void adg_dim_set_pos_from_model (AdgDim *dim,
AdgModel *model,
const gchar *pos);
gdouble adg_dim_get_level (AdgDim *dim); gdouble adg_dim_get_level (AdgDim *dim);
void adg_dim_set_level (AdgDim *dim, void adg_dim_set_level (AdgDim *dim,
gdouble level); gdouble level);
AdgThreeState adg_dim_get_outside (AdgDim *dim); AdgThreeState adg_dim_get_outside (AdgDim *dim);
void adg_dim_set_outside (AdgDim *dim, void adg_dim_set_outside (AdgDim *dim,
AdgThreeState outside); AdgThreeState outside);
const gchar * adg_dim_get_value (AdgDim *dim); const gchar * adg_dim_get_value (AdgDim *dim);
void adg_dim_set_value (AdgDim *dim, void adg_dim_set_value (AdgDim *dim,
const gchar *value); const gchar *value);
const gchar * adg_dim_get_min (AdgDim *dim); const gchar * adg_dim_get_min (AdgDim *dim);
void adg_dim_set_min (AdgDim *dim, void adg_dim_set_min (AdgDim *dim,
const gchar *min); const gchar *min);
const gchar * adg_dim_get_max (AdgDim *dim); const gchar * adg_dim_get_max (AdgDim *dim);
void adg_dim_set_max (AdgDim *dim, void adg_dim_set_max (AdgDim *dim,
const gchar *max); const gchar *max);
void adg_dim_set_limits (AdgDim *dim, void adg_dim_set_limits (AdgDim *dim,
const gchar *min, const gchar *min,
const gchar *max); const gchar *max);
AdgDimStyle * adg_dim_get_dim_style (AdgDim *dim);
gdouble adg_dim_quote_angle (AdgDim *dim, gdouble adg_dim_quote_angle (AdgDim *dim,
gdouble angle); gdouble angle);
AdgContainer * adg_dim_get_quote (AdgDim *dim); AdgContainer * adg_dim_get_quote (AdgDim *dim);
G_END_DECLS G_END_DECLS
#endif /* __ADG_DIM_H__ */ #endif /* __ADG_DIM_H__ */
 End of changes. 4 change blocks. 
3 lines changed or deleted 9 lines changed or added


 adg-dress.h   adg-dress.h 
skipping to change at line 27 skipping to change at line 27
* Boston, MA 02110-1301, USA. * Boston, MA 02110-1301, USA.
*/ */
#ifndef __ADG_DRESS_H__ #ifndef __ADG_DRESS_H__
#define __ADG_DRESS_H__ #define __ADG_DRESS_H__
#include <adg/adg-style.h> #include <adg/adg-style.h>
G_BEGIN_DECLS G_BEGIN_DECLS
#define ADG_TYPE_DRESS (adg_dress_get_type()) #define ADG_TYPE_DRESS (adg_dress_get_type())
#define ADG_VALUE_HOLDS_DRESS(value) (G_TYPE_CHECK_VALUE_TYPE((value), AD #define ADG_VALUE_HOLDS_DRESS(value) (G_TYPE_CHECK_VALUE_TYPE((value), A
G_TYPE_DRESS)) DG_TYPE_DRESS))
#define ADG_TYPE_PARAM_SPEC_DRESS (_adg_param_spec_dress_get_type())
#define ADG_IS_PARAM_SPEC_DRESS(spec) (G_TYPE_CHECK_INSTANCE_TYPE((spec),
ADG_TYPE_PARAM_SPEC_DRESS))
#define ADG_DRESS_UNDEFINED 0 #define ADG_TYPE_PARAM_SPEC_DRESS (_adg_param_spec_dress_get_type())
#define ADG_DRESS_COLOR_REGULAR (_adg_dress_color_regular()) #define ADG_IS_PARAM_SPEC_DRESS(spec) (G_TYPE_CHECK_INSTANCE_TYPE((spec),
#define ADG_DRESS_COLOR_DIMENSION (_adg_dress_color_dimension()) ADG_TYPE_PARAM_SPEC_DRESS))
#define ADG_DRESS_LINE_REGULAR (_adg_dress_line_regular())
#define ADG_DRESS_LINE_DIMENSION (_adg_dress_line_dimension())
#define ADG_DRESS_TEXT_REGULAR (_adg_dress_text_regular())
#define ADG_DRESS_TEXT_VALUE (_adg_dress_text_value())
#define ADG_DRESS_TEXT_LIMIT (_adg_dress_text_limit())
#define ADG_DRESS_DIMENSION_REGULAR (_adg_dress_dimension_regular())
typedef gint AdgDress; /* AdgDress defined in adg-entity.h */
GType adg_dress_get_type (void) G_GNUC_CONST; GType adg_dress_get_type (void) G_GNUC_CONST;
AdgDress adg_dress_new (const gchar *name, AdgDress adg_dress_new (const gchar *name,
AdgStyle *style); AdgStyle *fallback);
AdgDress adg_dress_new_full (const gchar *name, AdgDress adg_dress_new_full (const gchar *name,
AdgStyle *style, AdgStyle *fallback,
GType ancestor_t ype); GType ancestor_t ype);
gboolean adg_dress_set (AdgDress *dress, gboolean adg_dress_set (AdgDress *dress,
AdgDress src); AdgDress src);
gboolean adg_dress_are_related (AdgDress dress1, gboolean adg_dress_are_related (AdgDress dress1,
AdgDress dress2); AdgDress dress2);
const gchar * adg_dress_name (AdgDress dress); const gchar * adg_dress_name (AdgDress dress);
AdgDress adg_dress_from_name (const gchar *name); AdgDress adg_dress_from_name (const gchar *name);
GType adg_dress_get_ancestor_type (AdgDress dress); GType adg_dress_get_ancestor_type (AdgDress dress);
AdgStyle * adg_dress_get_style (AdgDress dress); AdgStyle * adg_dress_get_fallback (AdgDress dress);
void adg_dress_set_style (AdgDress dress, void adg_dress_set_fallback (AdgDress dress,
AdgStyle *style); AdgStyle *fallback);
gboolean adg_dress_accept_style (AdgDress dress, gboolean adg_dress_style_is_compatible (AdgDress dress,
AdgStyle *style); AdgStyle *style);
GType _adg_param_spec_dress_get_type (void) G_GNUC_CONST; GType _adg_param_spec_dress_get_type (void) G_GNUC_CONST;
GParamSpec * adg_param_spec_dress (const gchar *name, GParamSpec * adg_param_spec_dress (const gchar *name,
const gchar *nick, const gchar *nick,
const gchar *blurb, const gchar *blurb,
AdgDress dress, AdgDress dress,
GParamFlags flags); GParamFlags flags);
AdgDress _adg_dress_color_regular (void) G_GNUC_CONST;
AdgDress _adg_dress_color_dimension (void) G_GNUC_CONST;
AdgDress _adg_dress_line_regular (void) G_GNUC_CONST;
AdgDress _adg_dress_line_dimension (void) G_GNUC_CONST;
AdgDress _adg_dress_text_regular (void) G_GNUC_CONST;
AdgDress _adg_dress_text_value (void) G_GNUC_CONST;
AdgDress _adg_dress_text_limit (void) G_GNUC_CONST;
AdgDress _adg_dress_dimension_regular (void) G_GNUC_CONST;
G_END_DECLS G_END_DECLS
#endif /* __ADG_DRESS_H__ */ #endif /* __ADG_DRESS_H__ */
 End of changes. 7 change blocks. 
32 lines changed or deleted 13 lines changed or added


 adg-entity.h   adg-entity.h 
skipping to change at line 26 skipping to change at line 26
* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301, USA. * Boston, MA 02110-1301, USA.
*/ */
#ifndef __ADG_ENTITY_H__ #ifndef __ADG_ENTITY_H__
#define __ADG_ENTITY_H__ #define __ADG_ENTITY_H__
#include <adg/adg-util.h> #include <adg/adg-util.h>
#include <adg/adg-type-builtins.h> #include <adg/adg-type-builtins.h>
#include <adg/adg-matrix.h> #include <adg/adg-matrix.h>
#include <adg/adg-dress.h>
#include <cpml/cpml.h> #include <cpml/cpml.h>
G_BEGIN_DECLS G_BEGIN_DECLS
#define ADG_TYPE_ENTITY (adg_entity_get_type()) #define ADG_TYPE_ENTITY (adg_entity_get_type())
#define ADG_ENTITY(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), ADG_ TYPE_ENTITY, AdgEntity)) #define ADG_ENTITY(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), ADG_ TYPE_ENTITY, AdgEntity))
#define ADG_ENTITY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), ADG_T YPE_ENTITY, AdgEntityClass)) #define ADG_ENTITY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), ADG_T YPE_ENTITY, AdgEntityClass))
#define ADG_IS_ENTITY(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), ADG_ TYPE_ENTITY)) #define ADG_IS_ENTITY(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), ADG_ TYPE_ENTITY))
#define ADG_IS_ENTITY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), ADG_T YPE_ENTITY)) #define ADG_IS_ENTITY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), ADG_T YPE_ENTITY))
#define ADG_ENTITY_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), ADG_T YPE_ENTITY, AdgEntityClass)) #define ADG_ENTITY_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), ADG_T YPE_ENTITY, AdgEntityClass))
/* Forward declaration */
ADG_FORWARD_DECL(AdgStyle);
typedef gint AdgDress;
typedef struct _AdgEntity AdgEntity; typedef struct _AdgEntity AdgEntity;
typedef struct _AdgEntityClass AdgEntityClass; typedef struct _AdgEntityClass AdgEntityClass;
typedef void (*AdgEntityCallback) (AdgEntity *entity, gpointer user_data);
ADG_FORWARD_DECL(AdgCanvas); ADG_FORWARD_DECL(AdgCanvas);
struct _AdgEntity { struct _AdgEntity {
/*< private >*/ /*< private >*/
GInitiallyUnowned parent; GInitiallyUnowned parent;
gpointer data; gpointer data;
}; };
struct _AdgEntityClass { struct _AdgEntityClass {
skipping to change at line 86 skipping to change at line 90
void adg_entity_transform_global_map(AdgEntity *entity, void adg_entity_transform_global_map(AdgEntity *entity,
const AdgMatrix *transform ation, const AdgMatrix *transform ation,
AdgTransformationMode mode ); AdgTransformationMode mode );
void adg_entity_get_local_map (AdgEntity *entity, void adg_entity_get_local_map (AdgEntity *entity,
AdgMatrix *map); AdgMatrix *map);
void adg_entity_set_local_map (AdgEntity *entity, void adg_entity_set_local_map (AdgEntity *entity,
const AdgMatrix *map); const AdgMatrix *map);
void adg_entity_transform_local_map (AdgEntity *entity, void adg_entity_transform_local_map (AdgEntity *entity,
const AdgMatrix *transform ation, const AdgMatrix *transform ation,
AdgTransformationMode mode ); AdgTransformationMode mode );
AdgTransformationMode gboolean adg_entity_get_normalized (AdgEntity *entity);
adg_entity_get_local_mode (AdgEntity *entity); void adg_entity_set_normalized (AdgEntity *entity,
void adg_entity_set_local_mode (AdgEntity *entity, gboolean normalize
AdgTransformationMode mode d);
);
void adg_entity_get_extents (AdgEntity *entity, void adg_entity_get_extents (AdgEntity *entity,
CpmlExtents *extents); CpmlExtents *extents);
void adg_entity_set_extents (AdgEntity *entity, void adg_entity_set_extents (AdgEntity *entity,
const CpmlExtents *extents ); const CpmlExtents *extents );
AdgStyle * adg_entity_style (AdgEntity *entity, AdgStyle * adg_entity_style (AdgEntity *entity,
AdgDress dress); AdgDress dress);
AdgStyle * adg_entity_get_style (AdgEntity *entity, AdgStyle * adg_entity_get_style (AdgEntity *entity,
AdgDress dress); AdgDress dress);
void adg_entity_set_style (AdgEntity *entity, void adg_entity_set_style (AdgEntity *entity,
AdgDress dress, AdgDress dress,
AdgStyle *style); AdgStyle *style);
void adg_entity_apply_dress (AdgEntity *entity, void adg_entity_apply_dress (AdgEntity *entity,
AdgDress dress, AdgDress dress,
cairo_t *cr); cairo_t *cr);
const AdgMatrix *adg_entity_global_matrix (AdgEntity *entity); const AdgMatrix *adg_entity_global_matrix (AdgEntity *entity);
const AdgMatrix *adg_entity_local_matrix (AdgEntity *entity); const AdgMatrix *adg_entity_local_matrix (AdgEntity *entity);
void adg_entity_get_ctm (AdgEntity *entity, const AdgMatrix *adg_entity_ctm (AdgEntity *entity);
AdgMatrix *ctm);
void adg_entity_global_changed (AdgEntity *entity); void adg_entity_global_changed (AdgEntity *entity);
void adg_entity_local_changed (AdgEntity *entity); void adg_entity_local_changed (AdgEntity *entity);
void adg_entity_invalidate (AdgEntity *entity); void adg_entity_invalidate (AdgEntity *entity);
void adg_entity_arrange (AdgEntity *entity); void adg_entity_arrange (AdgEntity *entity);
void adg_entity_render (AdgEntity *entity, void adg_entity_render (AdgEntity *entity,
cairo_t *cr); cairo_t *cr);
G_END_DECLS G_END_DECLS
#endif /* __ADG_ENTITY_H__ */ #endif /* __ADG_ENTITY_H__ */
 End of changes. 5 change blocks. 
8 lines changed or deleted 10 lines changed or added


 adg-font-style.h   adg-font-style.h 
skipping to change at line 55 skipping to change at line 55
/*< private >*/ /*< private >*/
AdgStyleClass parent_class; AdgStyleClass parent_class;
}; };
GType adg_font_style_get_type (void) G_GNUC_CONST; GType adg_font_style_get_type (void) G_GNUC_CONST;
AdgStyle * adg_font_style_new (void); AdgStyle * adg_font_style_new (void);
cairo_scaled_font_t * cairo_scaled_font_t *
adg_font_style_font (AdgFontStyle *font_styl e, adg_font_style_font (AdgFontStyle *font_styl e,
const AdgMatrix *ctm); const AdgMatrix *ctm);
AdgDress adg_font_style_get_color_dress (AdgFontStyle *font_style
);
void adg_font_style_set_color_dress (AdgFontStyle *font_style
,
AdgDress dress);
const gchar * adg_font_style_get_family (AdgFontStyle *font_styl e); const gchar * adg_font_style_get_family (AdgFontStyle *font_styl e);
void adg_font_style_set_family (AdgFontStyle *font_styl e, void adg_font_style_set_family (AdgFontStyle *font_styl e,
const gchar *family); const gchar *family);
cairo_font_slant_t cairo_font_slant_t
adg_font_style_get_slant (AdgFontStyle *font_styl e); adg_font_style_get_slant (AdgFontStyle *font_styl e);
void adg_font_style_set_slant (AdgFontStyle *font_styl e, void adg_font_style_set_slant (AdgFontStyle *font_styl e,
cairo_font_slant_t slant); cairo_font_slant_t slant);
cairo_font_weight_t cairo_font_weight_t
adg_font_style_get_weight (AdgFontStyle *font_styl e); adg_font_style_get_weight (AdgFontStyle *font_styl e);
void adg_font_style_set_weight (AdgFontStyle *font_styl e, void adg_font_style_set_weight (AdgFontStyle *font_styl e,
 End of changes. 1 change blocks. 
0 lines changed or deleted 5 lines changed or added


 adg-ldim.h   adg-ldim.h 
skipping to change at line 53 skipping to change at line 53
struct _AdgLDimClass { struct _AdgLDimClass {
/*< private >*/ /*< private >*/
AdgDimClass parent_class; AdgDimClass parent_class;
}; };
GType adg_ldim_get_type (void) G_GNUC_CONST; GType adg_ldim_get_type (void) G_GNUC_CONST;
AdgLDim * adg_ldim_new (void); AdgLDim * adg_ldim_new (void);
AdgLDim * adg_ldim_new_full (const AdgPair *ref1, AdgLDim * adg_ldim_new_full (const AdgPair *ref1,
const AdgPair *ref2, const AdgPair *ref2,
gdouble direction, const AdgPair *pos,
const AdgPair *pos); gdouble direction)
;
AdgLDim * adg_ldim_new_full_explicit (gdouble ref1_x, AdgLDim * adg_ldim_new_full_explicit (gdouble ref1_x,
gdouble ref1_y, gdouble ref1_y,
gdouble ref2_x, gdouble ref2_x,
gdouble ref2_y, gdouble ref2_y,
gdouble direction,
gdouble pos_x, gdouble pos_x,
gdouble pos_y); gdouble pos_y,
gdouble direction)
;
AdgLDim * adg_ldim_new_full_from_model (AdgModel *model,
const gchar *ref1,
const gchar *ref2,
const gchar *pos,
gdouble direction)
;
gdouble adg_ldim_get_direction (AdgLDim *ldim); gdouble adg_ldim_get_direction (AdgLDim *ldim);
void adg_ldim_set_direction (AdgLDim *ldim, void adg_ldim_set_direction (AdgLDim *ldim,
gdouble direction) ; gdouble direction) ;
gboolean adg_ldim_has_extension1 (AdgLDim *ldim); gboolean adg_ldim_has_extension1 (AdgLDim *ldim);
void adg_ldim_switch_extension1 (AdgLDim *ldim, void adg_ldim_switch_extension1 (AdgLDim *ldim,
gboolean state); gboolean state);
gboolean adg_ldim_has_extension2 (AdgLDim *ldim); gboolean adg_ldim_has_extension2 (AdgLDim *ldim);
void adg_ldim_switch_extension2 (AdgLDim *ldim, void adg_ldim_switch_extension2 (AdgLDim *ldim,
gboolean state); gboolean state);
 End of changes. 3 change blocks. 
4 lines changed or deleted 12 lines changed or added


 adg-line-style.h   adg-line-style.h 
skipping to change at line 52 skipping to change at line 52
}; };
struct _AdgLineStyleClass { struct _AdgLineStyleClass {
/*< private >*/ /*< private >*/
AdgStyleClass parent_class; AdgStyleClass parent_class;
}; };
GType adg_line_style_get_type (void) G_GNUC_CONST; GType adg_line_style_get_type (void) G_GNUC_CONST;
AdgLineStyle * adg_line_style_new (void); AdgLineStyle * adg_line_style_new (void);
AdgDress adg_line_style_get_color_dress (AdgLineStyle *line_style
);
void adg_line_style_set_color_dress (AdgLineStyle *line_style
,
AdgDress dress);
gdouble adg_line_style_get_width (AdgLineStyle *line_style ); gdouble adg_line_style_get_width (AdgLineStyle *line_style );
void adg_line_style_set_width (AdgLineStyle *line_style , void adg_line_style_set_width (AdgLineStyle *line_style ,
gdouble width); gdouble width);
cairo_line_cap_t cairo_line_cap_t
adg_line_style_get_cap (AdgLineStyle *line_style ); adg_line_style_get_cap (AdgLineStyle *line_style );
void adg_line_style_set_cap (AdgLineStyle *line_style , void adg_line_style_set_cap (AdgLineStyle *line_style ,
cairo_line_cap_t cap); cairo_line_cap_t cap);
cairo_line_join_t cairo_line_join_t
adg_line_style_get_join (AdgLineStyle *line_style ); adg_line_style_get_join (AdgLineStyle *line_style );
void adg_line_style_set_join (AdgLineStyle *line_style , void adg_line_style_set_join (AdgLineStyle *line_style ,
 End of changes. 1 change blocks. 
0 lines changed or deleted 5 lines changed or added


 adg-marshal.h   adg-marshal.h 
skipping to change at line 18 skipping to change at line 18
/* VOID:VOID (adg-marshal.genmarshal:1) */ /* VOID:VOID (adg-marshal.genmarshal:1) */
#define adg_marshal_VOID__VOID g_cclosure_marshal_VOID__VOID #define adg_marshal_VOID__VOID g_cclosure_marshal_VOID__VOID
/* VOID:POINTER (adg-marshal.genmarshal:2) */ /* VOID:POINTER (adg-marshal.genmarshal:2) */
#define adg_marshal_VOID__POINTER g_cclosure_marshal_VOID__POINTER #define adg_marshal_VOID__POINTER g_cclosure_marshal_VOID__POINTER
/* VOID:OBJECT (adg-marshal.genmarshal:3) */ /* VOID:OBJECT (adg-marshal.genmarshal:3) */
#define adg_marshal_VOID__OBJECT g_cclosure_marshal_VOID__OBJECT #define adg_marshal_VOID__OBJECT g_cclosure_marshal_VOID__OBJECT
/* VOID:STRING,POINTER (adg-marshal.genmarshal:4) */
extern void adg_marshal_VOID__STRING_POINTER (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint
,
gpointer marshal_data);
G_END_DECLS G_END_DECLS
#endif /* __adg_marshal_MARSHAL_H__ */ #endif /* __adg_marshal_MARSHAL_H__ */
 End of changes. 1 change blocks. 
0 lines changed or deleted 9 lines changed or added


 adg-model.h   adg-model.h 
skipping to change at line 24 skipping to change at line 24
* You should have received a copy of the GNU Lesser General Public * You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the * License along with this library; if not, write to the
* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301, USA. * Boston, MA 02110-1301, USA.
*/ */
#ifndef __ADG_MODEL_H__ #ifndef __ADG_MODEL_H__
#define __ADG_MODEL_H__ #define __ADG_MODEL_H__
#include <adg/adg-entity.h> #include <adg/adg-entity.h>
#include <adg/adg-pair.h>
G_BEGIN_DECLS G_BEGIN_DECLS
#define ADG_TYPE_MODEL (adg_model_get_type()) #define ADG_TYPE_MODEL (adg_model_get_type())
#define ADG_MODEL(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), ADG_T YPE_MODEL, AdgModel)) #define ADG_MODEL(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), ADG_T YPE_MODEL, AdgModel))
#define ADG_MODEL_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), ADG_TY PE_MODEL, AdgModel)) #define ADG_MODEL_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), ADG_TY PE_MODEL, AdgModel))
#define ADG_IS_MODEL(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), ADG_T YPE_MODEL)) #define ADG_IS_MODEL(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), ADG_T YPE_MODEL))
#define ADG_IS_MODEL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), ADG_TY PE_MODEL)) #define ADG_IS_MODEL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), ADG_TY PE_MODEL))
#define ADG_MODEL_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), ADG_TY PE_MODEL, AdgModelClass)) #define ADG_MODEL_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), ADG_TY PE_MODEL, AdgModelClass))
typedef struct _AdgModel AdgModel; typedef struct _AdgModel AdgModel;
typedef struct _AdgModelClass AdgModelClass; typedef struct _AdgModelClass AdgModelClass;
typedef void (*AdgNamedPairCallback) (const gchar *name, AdgPair *pair,
gpointer user_data);
struct _AdgModel { struct _AdgModel {
/*< private >*/ /*< private >*/
GObject parent; GObject parent;
gpointer data; gpointer data;
}; };
struct _AdgModelClass { struct _AdgModelClass {
/*< private >*/ /*< private >*/
GObjectClass parent_class; GObjectClass parent_class;
/*< public >*/ /*< public >*/
GSList * (*get_dependencies) (AdgModel *model); void (*add_dependency) (AdgModel *model,
void (*add_dependency) (AdgModel *model, AdgEntity *entity);
AdgEntity *entity); void (*remove_dependency) (AdgModel *model,
void (*remove_dependency) (AdgModel *model, AdgEntity *entity);
AdgEntity *entity); const AdgPair * (*named_pair) (AdgModel *model,
void (*clear) (AdgModel *model); const gchar *name);
void (*changed) (AdgModel *model); void (*set_named_pair) (AdgModel *model,
const gchar *name,
const AdgPair *pair);
void (*clear) (AdgModel *model);
void (*changed) (AdgModel *model);
}; };
GType adg_model_get_type (void) G_GNUC_CONST; GType adg_model_get_type (void) G_GNUC_CONST;
void adg_model_add_dependency (AdgModel *model, void adg_model_add_dependency (AdgModel *model,
AdgEntity *entity); AdgEntity *entity);
void adg_model_remove_dependency (AdgModel *model, void adg_model_remove_dependency (AdgModel *model,
AdgEntity *entity); AdgEntity *entity);
GSList * adg_model_get_dependencies (AdgModel *model); const GSList * adg_model_dependencies (AdgModel *model);
void adg_model_foreach_dependency (AdgModel *model, void adg_model_foreach_dependency (AdgModel *model,
GCallback callback, AdgEntityCallback callback
gpointer user_data) ,
; gpointer user_dat
a);
void adg_model_clear (AdgModel *model); void adg_model_set_named_pair (AdgModel *model,
void adg_model_changed (AdgModel *model); const gchar *name,
const AdgPair *pair);
const AdgPair * adg_model_named_pair (AdgModel *model,
const gchar *name);
void adg_model_foreach_named_pair (AdgModel *model,
AdgNamedPairCallback callb
ack,
gpointer user_dat
a);
void adg_model_clear (AdgModel *model);
void adg_model_changed (AdgModel *model);
G_END_DECLS G_END_DECLS
#endif /* __ADG_MODEL_H__ */ #endif /* __ADG_MODEL_H__ */
 End of changes. 4 change blocks. 
19 lines changed or deleted 36 lines changed or added


 adg-path.h   adg-path.h 
skipping to change at line 26 skipping to change at line 26
* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301, USA. * Boston, MA 02110-1301, USA.
*/ */
#ifndef __ADG_PATH_H__ #ifndef __ADG_PATH_H__
#define __ADG_PATH_H__ #define __ADG_PATH_H__
#include <adg/adg-trail.h> #include <adg/adg-trail.h>
#include <adg/adg-primitive.h> #include <adg/adg-primitive.h>
#include <adg/adg-segment.h> #include <adg/adg-segment.h>
#include <cpml/cpml.h>
G_BEGIN_DECLS G_BEGIN_DECLS
#define ADG_TYPE_PATH (adg_path_get_type()) #define ADG_TYPE_PATH (adg_path_get_type())
#define ADG_PATH(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), ADG_TY PE_PATH, AdgPath)) #define ADG_PATH(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), ADG_TY PE_PATH, AdgPath))
#define ADG_PATH_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), ADG_TYP E_PATH, AdgPathClass)) #define ADG_PATH_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), ADG_TYP E_PATH, AdgPathClass))
#define ADG_IS_PATH(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), ADG_TY PE_PATH)) #define ADG_IS_PATH(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), ADG_TY PE_PATH))
#define ADG_IS_PATH_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), ADG_TYP E_PATH)) #define ADG_IS_PATH_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), ADG_TYP E_PATH))
#define ADG_PATH_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), ADG_TYP E_PATH, AdgPathClass)) #define ADG_PATH_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), ADG_TYP E_PATH, AdgPathClass))
skipping to change at line 54 skipping to change at line 53
}; };
struct _AdgPathClass { struct _AdgPathClass {
/*< private >*/ /*< private >*/
AdgTrailClass parent_class; AdgTrailClass parent_class;
}; };
GType adg_path_get_type (void) G_GNUC_CONST; GType adg_path_get_type (void) G_GNUC_CONST;
AdgPath * adg_path_new (void); AdgPath * adg_path_new (void);
void adg_path_get_current_point (AdgPath *path, const AdgPair * adg_path_current_point (AdgPath *path);
gdouble *x,
gdouble *y);
gboolean adg_path_has_current_point (AdgPath *path); gboolean adg_path_has_current_point (AdgPath *path);
const AdgPrimitive *
adg_path_last_primitive (AdgPath *path);
const AdgPrimitive *
adg_path_over_primitive (AdgPath *path);
void adg_path_append (AdgPath *path, void adg_path_append (AdgPath *path,
cairo_path_data_type_t cairo_path_data_type_t typ
type, e,
...); ...);
void adg_path_append_valist (AdgPath *path, void adg_path_append_valist (AdgPath *path,
cairo_path_data_type_t cairo_path_data_type_t typ
type, e,
va_list var_args); va_list var_args);
void adg_path_append_primitive (AdgPath *path, void adg_path_append_primitive (AdgPath *path,
const AdgPrimitive const AdgPrimitive
*primitive) ; *primitive) ;
void adg_path_append_segment (AdgPath *path, void adg_path_append_segment (AdgPath *path,
const AdgSegment const AdgSegment *segment)
*segment); ;
void adg_path_append_cairo_path (AdgPath *path, void adg_path_append_cpml_path (AdgPath *path,
const cairo_path_t const CpmlPath *cpml_path)
*cairo_path ;
);
void adg_path_move_to (AdgPath *path, void adg_path_move_to (AdgPath *path,
const AdgPair *pair);
void adg_path_move_to_explicit (AdgPath *path,
gdouble x, gdouble x,
gdouble y); gdouble y);
void adg_path_line_to (AdgPath *path, void adg_path_line_to (AdgPath *path,
const AdgPair *pair);
void adg_path_line_to_explicit (AdgPath *path,
gdouble x, gdouble x,
gdouble y); gdouble y);
void adg_path_arc_to (AdgPath *path, void adg_path_arc_to (AdgPath *path,
const AdgPair *throught,
const AdgPair *pair);
void adg_path_arc_to_explicit (AdgPath *path,
gdouble x1, gdouble x1,
gdouble y1, gdouble y1,
gdouble x2, gdouble x2,
gdouble y2); gdouble y2);
void adg_path_curve_to (AdgPath *path, void adg_path_curve_to (AdgPath *path,
const AdgPair *control1,
const AdgPair *control2,
const AdgPair *pair);
void adg_path_curve_to_explicit (AdgPath *path,
gdouble x1, gdouble x1,
gdouble y1, gdouble y1,
gdouble x2, gdouble x2,
gdouble y2, gdouble y2,
gdouble x3, gdouble x3,
gdouble y3); gdouble y3);
void adg_path_close (AdgPath *path); void adg_path_close (AdgPath *path);
void adg_path_arc (AdgPath *path, void adg_path_arc (AdgPath *path,
const AdgPair *pair,
gdouble r,
gdouble start,
gdouble end);
void adg_path_arc_explicit (AdgPath *path,
gdouble xc, gdouble xc,
gdouble yc, gdouble yc,
gdouble r, gdouble r,
gdouble start, gdouble start,
gdouble end); gdouble end);
void adg_path_chamfer (AdgPath *path, void adg_path_chamfer (AdgPath *path,
gdouble delta1, gdouble delta1,
gdouble delta2); gdouble delta2);
void adg_path_fillet (AdgPath *path, void adg_path_fillet (AdgPath *path,
gdouble radius); gdouble radius);
void adg_path_reflect (AdgPath *path,
const CpmlVector *vector);
G_END_DECLS G_END_DECLS
#endif /* __ADG_PATH_H__ */ #endif /* __ADG_PATH_H__ */
 End of changes. 12 change blocks. 
14 lines changed or deleted 32 lines changed or added


 adg-stroke.h   adg-stroke.h 
skipping to change at line 53 skipping to change at line 53
struct _AdgStrokeClass { struct _AdgStrokeClass {
/*< private >*/ /*< private >*/
AdgEntityClass parent_class; AdgEntityClass parent_class;
}; };
GType adg_stroke_get_type (void) G_GNUC_CONST; GType adg_stroke_get_type (void) G_GNUC_CONST;
AdgStroke * adg_stroke_new (AdgTrail *trail); AdgStroke * adg_stroke_new (AdgTrail *trail);
AdgDress adg_stroke_get_dress (AdgStroke *stroke); AdgDress adg_stroke_get_line_dress (AdgStroke *stroke);
void adg_stroke_set_dress (AdgStroke *stroke, void adg_stroke_set_line_dress (AdgStroke *stroke,
AdgDress dress); AdgDress dress);
AdgTrail * adg_stroke_get_trail (AdgStroke *stroke); AdgTrail * adg_stroke_get_trail (AdgStroke *stroke);
void adg_stroke_set_trail (AdgStroke *stroke, void adg_stroke_set_trail (AdgStroke *stroke,
AdgTrail *trail); AdgTrail *trail);
G_END_DECLS G_END_DECLS
#endif /* __ADG_STROKE_H__ */ #endif /* __ADG_STROKE_H__ */
 End of changes. 1 change blocks. 
2 lines changed or deleted 2 lines changed or added


 adg-style.h   adg-style.h 
skipping to change at line 23 skipping to change at line 23
* *
* You should have received a copy of the GNU Lesser General Public * You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the * License along with this library; if not, write to the
* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301, USA. * Boston, MA 02110-1301, USA.
*/ */
#ifndef __ADG_STYLE_H__ #ifndef __ADG_STYLE_H__
#define __ADG_STYLE_H__ #define __ADG_STYLE_H__
#include <glib-object.h> #include <adg/adg-entity.h>
#include <cairo.h>
G_BEGIN_DECLS G_BEGIN_DECLS
#define ADG_TYPE_STYLE (adg_style_get_type()) #define ADG_TYPE_STYLE (adg_style_get_type())
#define ADG_STYLE(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), ADG_T YPE_STYLE, AdgStyle)) #define ADG_STYLE(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), ADG_T YPE_STYLE, AdgStyle))
#define ADG_STYLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), ADG_TY PE_STYLE, AdgStyleClass)) #define ADG_STYLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), ADG_TY PE_STYLE, AdgStyleClass))
#define ADG_IS_STYLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), ADG_T YPE_STYLE)) #define ADG_IS_STYLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), ADG_T YPE_STYLE))
#define ADG_IS_STYLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), ADG_TY PE_STYLE)) #define ADG_IS_STYLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), ADG_TY PE_STYLE))
#define ADG_STYLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), ADG_TY PE_STYLE, AdgStyleClass)) #define ADG_STYLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), ADG_TY PE_STYLE, AdgStyleClass))
typedef struct _AdgStyle AdgStyle; #if 0
/* This is declared in adg-entity.h */
typedef struct _AdgStyle AdgStyle;
#endif
typedef struct _AdgStyleClass AdgStyleClass; typedef struct _AdgStyleClass AdgStyleClass;
struct _AdgStyle { struct _AdgStyle {
/*< private >*/ /*< private >*/
GObject parent; GObject parent;
}; };
struct _AdgStyleClass { struct _AdgStyleClass {
/*< private >*/ /*< private >*/
GObjectClass parent_class; GObjectClass parent_class;
/*< public >*/ /*< public >*/
void (*apply) (AdgStyle *style, void (*apply) (AdgStyle *style,
AdgEntity *entity,
cairo_t *cr); cairo_t *cr);
}; };
GType adg_style_get_type (void) G_GNUC_CONST; GType adg_style_get_type (void) G_GNUC_CONST;
void adg_style_apply (AdgStyle *style, void adg_style_apply (AdgStyle *style,
AdgEntity *entity,
cairo_t *cr); cairo_t *cr);
G_END_DECLS G_END_DECLS
#endif /* __ADG_STYLE_H__ */ #endif /* __ADG_STYLE_H__ */
 End of changes. 4 change blocks. 
3 lines changed or deleted 7 lines changed or added


 adg-toy-text.h   adg-toy-text.h 
skipping to change at line 51 skipping to change at line 51
gpointer data; gpointer data;
}; };
struct _AdgToyTextClass { struct _AdgToyTextClass {
/*< private >*/ /*< private >*/
AdgEntityClass parent_class; AdgEntityClass parent_class;
}; };
GType adg_toy_text_get_type (void) G_GNUC_CONST; GType adg_toy_text_get_type (void) G_GNUC_CONST;
AdgToyText * adg_toy_text_new (const gchar *label); AdgToyText * adg_toy_text_new (const gchar *label);
AdgDress adg_toy_text_get_dress (AdgToyText *toy_text); AdgDress adg_toy_text_get_font_dress (AdgToyText *toy_text);
void adg_toy_text_set_dress (AdgToyText *toy_text, void adg_toy_text_set_font_dress (AdgToyText *toy_text,
AdgDress dress); AdgDress dress);
const gchar * adg_toy_text_get_label (AdgToyText *toy_text); const gchar * adg_toy_text_get_label (AdgToyText *toy_text);
void adg_toy_text_set_label (AdgToyText *toy_text, void adg_toy_text_set_label (AdgToyText *toy_text,
const gchar *label); const gchar *label);
G_END_DECLS G_END_DECLS
#endif /* __ADG_TOY_TEXT_H__ */ #endif /* __ADG_TOY_TEXT_H__ */
 End of changes. 1 change blocks. 
2 lines changed or deleted 2 lines changed or added


 adg-trail.h   adg-trail.h 
skipping to change at line 64 skipping to change at line 64
GType adg_trail_get_type (void) G_GNUC_CONST; GType adg_trail_get_type (void) G_GNUC_CONST;
AdgTrail * adg_trail_new (AdgTrailCallback callback, AdgTrail * adg_trail_new (AdgTrailCallback callback,
gpointer user_data ); gpointer user_data );
const cairo_path_t * const cairo_path_t *
adg_trail_get_cairo_path (AdgTrail *trail); adg_trail_get_cairo_path (AdgTrail *trail);
CpmlPath * adg_trail_get_cpml_path (AdgTrail *trail); CpmlPath * adg_trail_get_cpml_path (AdgTrail *trail);
gboolean adg_trail_get_segment (AdgTrail *trail, gboolean adg_trail_get_segment (AdgTrail *trail,
AdgSegment *segment, AdgSegment *segment,
guint n); guint n);
const CpmlExtents *
adg_trail_extents (AdgTrail *trail);
void adg_trail_dump (AdgTrail *trail); void adg_trail_dump (AdgTrail *trail);
G_END_DECLS G_END_DECLS
#endif /* __ADG_TRAIL_H__ */ #endif /* __ADG_TRAIL_H__ */
 End of changes. 1 change blocks. 
0 lines changed or deleted 2 lines changed or added


 adg.h   adg.h 
skipping to change at line 28 skipping to change at line 28
*/ */
#ifndef __ADG_H__ #ifndef __ADG_H__
#define __ADG_H__ #define __ADG_H__
#include <adg/adg-adim.h> #include <adg/adg-adim.h>
#include <adg/adg-canvas.h> #include <adg/adg-canvas.h>
#include <adg/adg-container.h> #include <adg/adg-container.h>
#include <adg/adg-dim.h> #include <adg/adg-dim.h>
#include <adg/adg-dress.h> #include <adg/adg-dress.h>
#include <adg/adg-dress-builtins.h>
#include <adg/adg-edges.h> #include <adg/adg-edges.h>
#include <adg/adg-entity.h> #include <adg/adg-entity.h>
#include <adg/adg-enums.h> #include <adg/adg-enums.h>
#include <adg/adg-fill-style.h>
#include <adg/adg-hatch.h>
#include <adg/adg-ldim.h> #include <adg/adg-ldim.h>
#include <adg/adg-matrix.h> #include <adg/adg-matrix.h>
#include <adg/adg-model.h> #include <adg/adg-model.h>
#include <adg/adg-pair.h> #include <adg/adg-pair.h>
#include <adg/adg-path.h> #include <adg/adg-path.h>
#include <adg/adg-pattern.h>
#include <adg/adg-point.h>
#include <adg/adg-primitive.h> #include <adg/adg-primitive.h>
#include <adg/adg-rdim.h>
#include <adg/adg-segment.h> #include <adg/adg-segment.h>
#include <adg/adg-stroke.h> #include <adg/adg-stroke.h>
#include <adg/adg-style.h> #include <adg/adg-style.h>
#include <adg/adg-title-block.h> #include <adg/adg-title-block.h>
#include <adg/adg-toy-text.h> #include <adg/adg-toy-text.h>
#include <adg/adg-type-builtins.h> #include <adg/adg-type-builtins.h>
#include <adg/adg-util.h> #include <adg/adg-util.h>
#include <adg/adg-widget.h> #include <adg/adg-widget.h>
#endif /* __ADG_H__ */ #endif /* __ADG_H__ */
 End of changes. 4 change blocks. 
0 lines changed or deleted 6 lines changed or added


 cpml-arc.h   cpml-arc.h 
skipping to change at line 36 skipping to change at line 36
CAIRO_BEGIN_DECLS CAIRO_BEGIN_DECLS
int cpml_arc_type_get_npoints (void) CPML_GNUC_CONST; int cpml_arc_type_get_npoints (void) CPML_GNUC_CONST;
cairo_bool_t cairo_bool_t
cpml_arc_info (const CpmlPrimitive *arc, cpml_arc_info (const CpmlPrimitive *arc,
CpmlPair *center, CpmlPair *center,
double *r, double *r,
double *start, double *start,
double *end); double *end);
double cpml_arc_length (const CpmlPrimitive *arc); double cpml_arc_length (const CpmlPrimitive *arc);
void cpml_arc_extents (const CpmlPrimitive *arc,
CpmlExtents *extents);
void cpml_arc_pair_at (const CpmlPrimitive *arc, void cpml_arc_pair_at (const CpmlPrimitive *arc,
CpmlPair *pair, CpmlPair *pair,
double pos); double pos);
void cpml_arc_vector_at (const CpmlPrimitive *arc, void cpml_arc_vector_at (const CpmlPrimitive *arc,
CpmlVector *vector, CpmlVector *vector,
double pos); double pos);
double cpml_arc_near_pos (const CpmlPrimitive *arc, double cpml_arc_near_pos (const CpmlPrimitive *arc,
const CpmlPair *pair); const CpmlPair *pair);
int cpml_arc_intersection (const CpmlPrimitive *arc, int cpml_arc_intersection (const CpmlPrimitive *arc,
const CpmlPrimitive *arc2, const CpmlPrimitive *arc2,
 End of changes. 1 change blocks. 
0 lines changed or deleted 2 lines changed or added


 cpml-curve.h   cpml-curve.h 
skipping to change at line 30 skipping to change at line 30
#ifndef __CPML_CURVE_H__ #ifndef __CPML_CURVE_H__
#define __CPML_CURVE_H__ #define __CPML_CURVE_H__
#include <cpml/cpml-primitive.h> #include <cpml/cpml-primitive.h>
#include <cpml/cpml-util.h> #include <cpml/cpml-util.h>
CAIRO_BEGIN_DECLS CAIRO_BEGIN_DECLS
int cpml_curve_type_get_npoints (void) CPML_GNUC_CONST; int cpml_curve_type_get_npoints (void) CPML_GNUC_CONST;
double cpml_curve_length (const CpmlPrimitive *curve); double cpml_curve_length (const CpmlPrimitive *curve);
void cpml_curve_extents (const CpmlPrimitive *curve,
CpmlExtents *extents);
void cpml_curve_pair_at_time (const CpmlPrimitive *curve, void cpml_curve_pair_at_time (const CpmlPrimitive *curve,
CpmlPair *pair, CpmlPair *pair,
double time); double t);
void cpml_curve_pair_at (const CpmlPrimitive *curve, void cpml_curve_pair_at (const CpmlPrimitive *curve,
CpmlPair *pair, CpmlPair *pair,
double pos); double pos);
void cpml_curve_vector_at_time (const CpmlPrimitive *curve, void cpml_curve_vector_at_time (const CpmlPrimitive *curve,
CpmlVector *vector, CpmlVector *vector,
double t); double t);
void cpml_curve_vector_at (const CpmlPrimitive *curve, void cpml_curve_vector_at (const CpmlPrimitive *curve,
CpmlVector *vector, CpmlVector *vector,
double pos); double pos);
double cpml_curve_near_pos (const CpmlPrimitive *curve, double cpml_curve_near_pos (const CpmlPrimitive *curve,
 End of changes. 2 change blocks. 
1 lines changed or deleted 3 lines changed or added


 cpml-extents.h   cpml-extents.h 
skipping to change at line 32 skipping to change at line 32
#include <cpml/cpml-pair.h> #include <cpml/cpml-pair.h>
CAIRO_BEGIN_DECLS CAIRO_BEGIN_DECLS
typedef struct _CpmlExtents CpmlExtents; typedef struct _CpmlExtents CpmlExtents;
struct _CpmlExtents { struct _CpmlExtents {
cairo_bool_t is_defined; cairo_bool_t is_defined;
CpmlPair org; CpmlPair org;
CpmlPair size; CpmlVector size;
}; };
CpmlExtents * cpml_extents_copy (CpmlExtents *extents , CpmlExtents * cpml_extents_copy (CpmlExtents *extents ,
const CpmlExtents *src); const CpmlExtents *src);
CpmlExtents * cpml_extents_from_cairo_text (CpmlExtents *extents , CpmlExtents * cpml_extents_from_cairo_text (CpmlExtents *extents ,
const cairo_text_extents_t const cairo_text_extents_t
*cairo_e xtents); *cairo_e xtents);
void cpml_extents_add (CpmlExtents *extents , void cpml_extents_add (CpmlExtents *extents ,
const CpmlExtents *src); const CpmlExtents *src);
void cpml_extents_pair_add (CpmlExtents *extents
,
const CpmlPair *src);
cairo_bool_t cpml_extents_is_inside (const CpmlExtents *extents
,
const CpmlExtents *src);
cairo_bool_t cpml_extents_pair_is_inside (const CpmlExtents *extents
,
const CpmlPair *src);
CAIRO_END_DECLS CAIRO_END_DECLS
#endif /* __CPML_EXTENTS_H__ */ #endif /* __CPML_EXTENTS_H__ */
 End of changes. 2 change blocks. 
1 lines changed or deleted 10 lines changed or added


 cpml-line.h   cpml-line.h 
skipping to change at line 30 skipping to change at line 30
#ifndef __CPML_LINE_H__ #ifndef __CPML_LINE_H__
#define __CPML_LINE_H__ #define __CPML_LINE_H__
#include <cpml/cpml-primitive.h> #include <cpml/cpml-primitive.h>
#include <cpml/cpml-util.h> #include <cpml/cpml-util.h>
CAIRO_BEGIN_DECLS CAIRO_BEGIN_DECLS
int cpml_line_type_get_npoints (void) CPML_GNUC_CONST; int cpml_line_type_get_npoints (void) CPML_GNUC_CONST;
double cpml_line_length (const CpmlPrimitive *line); double cpml_line_length (const CpmlPrimitive *line);
void cpml_line_extents (const CpmlPrimitive *line,
CpmlExtents *extents);
void cpml_line_pair_at (const CpmlPrimitive *line, void cpml_line_pair_at (const CpmlPrimitive *line,
CpmlPair *pair, CpmlPair *pair,
double pos); double pos);
void cpml_line_vector_at (const CpmlPrimitive *line, void cpml_line_vector_at (const CpmlPrimitive *line,
CpmlVector *vector, CpmlVector *vector,
double pos); double pos);
double cpml_line_near_pos (const CpmlPrimitive *line, double cpml_line_near_pos (const CpmlPrimitive *line,
const CpmlPair *pair); const CpmlPair *pair);
int cpml_line_intersection (const CpmlPrimitive *line, int cpml_line_intersection (const CpmlPrimitive *line,
const CpmlPrimitive *line2, const CpmlPrimitive *line2,
 End of changes. 1 change blocks. 
0 lines changed or deleted 2 lines changed or added


 cpml-pair.h   cpml-pair.h 
skipping to change at line 57 skipping to change at line 57
const CpmlPair *src); const CpmlPair *src);
cairo_bool_t cpml_pair_div (CpmlPair *pair, cairo_bool_t cpml_pair_div (CpmlPair *pair,
const CpmlPair *src); const CpmlPair *src);
void cpml_pair_transform (CpmlPair *pair, void cpml_pair_transform (CpmlPair *pair,
const cairo_matrix_t const cairo_matrix_t
*matrix); *matrix);
double cpml_pair_squared_distance (const CpmlPair *from, double cpml_pair_squared_distance (const CpmlPair *from,
const CpmlPair *to); const CpmlPair *to);
double cpml_pair_distance (const CpmlPair *from, double cpml_pair_distance (const CpmlPair *from,
const CpmlPair *to); const CpmlPair *to);
void cpml_pair_to_cairo (const CpmlPair *pair,
cairo_path_data_t
*path_data)
;
CpmlVector * cpml_vector_from_angle (CpmlVector *vector, CpmlVector * cpml_vector_from_angle (CpmlVector *vector,
double angle); double angle);
void cpml_vector_set_length (CpmlVector *vector, void cpml_vector_set_length (CpmlVector *vector,
double length); double length);
double cpml_vector_angle (const CpmlVector double cpml_vector_angle (const CpmlVector
*vector); *vector);
void cpml_vector_normal (CpmlVector *vector); void cpml_vector_normal (CpmlVector *vector);
void cpml_pair_to_cairo (const CpmlPair *pair, void cpml_vector_transform (CpmlVector *vector,
cairo_path_data_t const cairo_matrix_t
*path_data) *matrix);
;
CAIRO_END_DECLS CAIRO_END_DECLS
#endif /* __CPML_PAIR_H__ */ #endif /* __CPML_PAIR_H__ */
 End of changes. 2 change blocks. 
4 lines changed or deleted 7 lines changed or added


 cpml-primitive.h   cpml-primitive.h 
skipping to change at line 64 skipping to change at line 64
cairo_bool_t org_also); cairo_bool_t org_also);
int cpml_primitive_intersection_with_segment int cpml_primitive_intersection_with_segment
(const CpmlPrimitive *primitive, (const CpmlPrimitive *primitive,
const CpmlSegment *segment, const CpmlSegment *segment,
CpmlPair *dest, CpmlPair *dest,
int max); int max);
/* To be implemented by the primitives */ /* To be implemented by the primitives */
int cpml_primitive_type_get_npoints (CpmlPrimitiveType type); int cpml_primitive_type_get_npoints (CpmlPrimitiveType type);
double cpml_primitive_length (const CpmlPrimitive *primitive) ; double cpml_primitive_length (const CpmlPrimitive *primitive) ;
void cpml_primitive_extents (const CpmlPrimitive *primitive,
CpmlExtents *extents);
void cpml_primitive_pair_at (const CpmlPrimitive *primitive, void cpml_primitive_pair_at (const CpmlPrimitive *primitive,
CpmlPair *pair, CpmlPair *pair,
double pos); double pos);
void cpml_primitive_vector_at (const CpmlPrimitive *primitive, void cpml_primitive_vector_at (const CpmlPrimitive *primitive,
CpmlVector *vector, CpmlVector *vector,
double pos); double pos);
double cpml_primitive_near_pos (const CpmlPrimitive *primitive, double cpml_primitive_near_pos (const CpmlPrimitive *primitive,
const CpmlPair *pair); const CpmlPair *pair);
cairo_bool_t cairo_bool_t
cpml_primitive_join (CpmlPrimitive *primitive, cpml_primitive_join (CpmlPrimitive *primitive,
 End of changes. 1 change blocks. 
0 lines changed or deleted 2 lines changed or added


 cpml-segment.h   cpml-segment.h 
skipping to change at line 24 skipping to change at line 24
* You should have received a copy of the GNU Lesser General Public * You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the * License along with this library; if not, write to the
* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301, USA. * Boston, MA 02110-1301, USA.
*/ */
#ifndef __CPML_SEGMENT_H__ #ifndef __CPML_SEGMENT_H__
#define __CPML_SEGMENT_H__ #define __CPML_SEGMENT_H__
#include <cairo.h> #include <cairo.h>
#include <cpml/cpml-pair.h> #include <cpml/cpml-extents.h>
CAIRO_BEGIN_DECLS CAIRO_BEGIN_DECLS
typedef cairo_path_t CpmlPath; typedef cairo_path_t CpmlPath;
typedef struct _CpmlSegment CpmlSegment; typedef struct _CpmlSegment CpmlSegment;
struct _CpmlSegment { struct _CpmlSegment {
CpmlPath *path; CpmlPath *path;
cairo_path_data_t *data; cairo_path_data_t *data;
int num_data; int num_data;
skipping to change at line 53 skipping to change at line 53
void cpml_segment_to_cairo (const CpmlSegment *segment, void cpml_segment_to_cairo (const CpmlSegment *segment,
cairo_t *cr); cairo_t *cr);
void cpml_segment_dump (const CpmlSegment *segment); void cpml_segment_dump (const CpmlSegment *segment);
void cpml_segment_reset (CpmlSegment *segment); void cpml_segment_reset (CpmlSegment *segment);
cairo_bool_t cairo_bool_t
cpml_segment_next (CpmlSegment *segment); cpml_segment_next (CpmlSegment *segment);
double cpml_segment_length (const CpmlSegment *segment); double cpml_segment_length (const CpmlSegment *segment);
void cpml_segment_extents (const CpmlSegment *segment,
CpmlExtents *extents);
void cpml_segment_pair_at (const CpmlSegment *segment, void cpml_segment_pair_at (const CpmlSegment *segment,
CpmlPair *pair, CpmlPair *pair,
double pos); double pos);
void cpml_segment_vector_at (const CpmlSegment *segment, void cpml_segment_vector_at (const CpmlSegment *segment,
CpmlVector *vector, CpmlVector *vector,
double pos); double pos);
void cpml_segment_reverse (CpmlSegment *segment); void cpml_segment_reverse (CpmlSegment *segment);
void cpml_segment_transform (CpmlSegment *segment, void cpml_segment_transform (CpmlSegment *segment,
const cairo_matrix_t *matrix); const cairo_matrix_t *matrix);
 End of changes. 2 change blocks. 
1 lines changed or deleted 3 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/