| adg-container.h | | adg-container.h | |
| | | | |
| skipping to change at line 56 | | skipping to change at line 56 | |
| AdgEntityClass parent_class; | | AdgEntityClass parent_class; | |
| | | | |
| /* Virtual Table */ | | /* Virtual Table */ | |
| GSList * (*get_children) (AdgContainer *container)
; | | GSList * (*get_children) (AdgContainer *container)
; | |
| gboolean (*add) (AdgContainer *container, | | gboolean (*add) (AdgContainer *container, | |
| AdgEntity *entity); | | AdgEntity *entity); | |
| gboolean (*remove) (AdgContainer *container, | | gboolean (*remove) (AdgContainer *container, | |
| AdgEntity *entity); | | AdgEntity *entity); | |
| }; | | }; | |
| | | | |
|
| GType adg_container_get_type (void) G_GNUC_CONST; | | GType adg_container_get_type (void) G_GNUC_CONST; | |
| GSList * adg_container_get_children (AdgContainer *container); | | | |
| void adg_container_add (AdgContainer *container, | | | |
| AdgEntity *entity); | | | |
| void adg_container_remove (AdgContainer *container, | | | |
| AdgEntity *entity); | | | |
| | | | |
|
| void adg_container_foreach (AdgContainer *container, | | AdgEntity * adg_container_new (void); | |
| GCallback callback, | | GSList * adg_container_get_children (AdgContainer *container | |
| gpointer user_data); | | ); | |
| void adg_container_propagate (AdgContainer *container, | | void adg_container_add (AdgContainer *container | |
| guint signal_id, | | , | |
| GQuark detail, | | AdgEntity *entity); | |
| ...); | | void adg_container_remove (AdgContainer *container | |
| void adg_container_propagate_by_name(AdgContainer *container, | | , | |
| const gchar *detailed_si | | AdgEntity *entity); | |
| gnal, | | | |
| ...); | | void adg_container_foreach (AdgContainer *container | |
| void adg_container_propagate_valist(AdgContainer *container, | | , | |
| guint signal_id, | | GCallback callback, | |
| GQuark detail, | | gpointer user_data | |
| va_list var_args); | | ); | |
| const AdgMatrix *adg_container_get_model_transformation | | void adg_container_propagate (AdgContainer *container | |
| (AdgContainer *container) | | , | |
| ; | | guint signal_id | |
| void adg_container_set_model_transformation | | , | |
| (AdgContainer *container, | | GQuark detail, | |
| AdgMatrix *transforma | | ...); | |
| tion); | | void adg_container_propagate_by_name (AdgContainer *container | |
| const AdgMatrix *adg_container_get_paper_transformation | | , | |
| (AdgContainer *container) | | const gchar *detailed_ | |
| ; | | signal, | |
| void adg_container_set_paper_transformation | | ...); | |
| (AdgContainer *container, | | void adg_container_propagate_valist (AdgContainer *container | |
| AdgMatrix *transforma | | , | |
| tion); | | guint signal_id | |
| | | , | |
| | | GQuark detail, | |
| | | va_list var_args) | |
| | | ; | |
| | | const AdgMatrix * | |
| | | adg_container_get_model_transformation | |
| | | (AdgContainer *container | |
| | | ); | |
| | | void adg_container_set_model_transformation | |
| | | (AdgContainer *container | |
| | | , | |
| | | const AdgMatrix *transform | |
| | | ation); | |
| | | const AdgMatrix * | |
| | | adg_container_get_paper_transformation | |
| | | (AdgContainer *container | |
| | | ); | |
| | | void adg_container_set_paper_transformation | |
| | | (AdgContainer *container | |
| | | , | |
| | | const AdgMatrix *transform | |
| | | ation); | |
| | | | |
| G_END_DECLS | | G_END_DECLS | |
| | | | |
| #endif /* __ADG_CONTAINER_H__ */ | | #endif /* __ADG_CONTAINER_H__ */ | |
| | | | |
End of changes. 2 change blocks. |
| 35 lines changed or deleted | | 52 lines changed or added | |
|
| adg-path.h | | adg-path.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_PATH_H__ | | #ifndef __ADG_PATH_H__ | |
| #define __ADG_PATH_H__ | | #define __ADG_PATH_H__ | |
| | | | |
| #include <adg/adg-model.h> | | #include <adg/adg-model.h> | |
|
| | | #include <adg/adg-primitive.h> | |
| | | #include <adg/adg-segment.h> | |
| #include <cpml/cpml.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_T
YPE_PATH, AdgPath)) | | #define ADG_PATH(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), ADG_T
YPE_PATH, AdgPath)) | |
| #define ADG_PATH_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), ADG_TY
PE_PATH, AdgPathClass)) | | #define ADG_PATH_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), ADG_TY
PE_PATH, AdgPathClass)) | |
| #define ADG_IS_PATH(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ADG_T
YPE_PATH)) | | #define ADG_IS_PATH(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ADG_T
YPE_PATH)) | |
| #define ADG_IS_PATH_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), ADG_TY
PE_PATH)) | | #define ADG_IS_PATH_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), ADG_TY
PE_PATH)) | |
| #define ADG_PATH_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), ADG_TY
PE_PATH, AdgPathClass)) | | #define ADG_PATH_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), ADG_TY
PE_PATH, AdgPathClass)) | |
| | | | |
| skipping to change at line 55 | | skipping to change at line 57 | |
| struct _AdgPathClass { | | struct _AdgPathClass { | |
| AdgModelClass parent_class; | | AdgModelClass parent_class; | |
| }; | | }; | |
| | | | |
| GType adg_path_get_type (void) G_GNUC_CONST; | | GType adg_path_get_type (void) G_GNUC_CONST; | |
| AdgModel * adg_path_new (void); | | AdgModel * adg_path_new (void); | |
| | | | |
| const cairo_path_t * | | const cairo_path_t * | |
| adg_path_get_cairo_path (AdgPath *path); | | adg_path_get_cairo_path (AdgPath *path); | |
| cairo_path_t * adg_path_get_cpml_path (AdgPath *path); | | cairo_path_t * adg_path_get_cpml_path (AdgPath *path); | |
|
| cairo_path_t * adg_path_dup_cpml_path (AdgPath *path); | | | |
| void adg_path_get_current_point (AdgPath *path, | | void adg_path_get_current_point (AdgPath *path, | |
| gdouble *x, | | gdouble *x, | |
| gdouble *y); | | gdouble *y); | |
| gboolean adg_path_has_current_point (AdgPath *path); | | gboolean adg_path_has_current_point (AdgPath *path); | |
| void adg_path_clear (AdgPath *path); | | void adg_path_clear (AdgPath *path); | |
| | | | |
| void adg_path_append (AdgPath *path, | | void adg_path_append (AdgPath *path, | |
|
| cairo_path_data_type_t typ | | cairo_path_data_type_t | |
| e, | | type, | |
| ...); | | ...); | |
| void adg_path_append_valist (AdgPath *path, | | void adg_path_append_valist (AdgPath *path, | |
|
| cairo_path_data_type_t typ | | cairo_path_data_type_t | |
| e, | | type, | |
| va_list var_args); | | va_list var_args); | |
|
| | | void adg_path_append_primitive (AdgPath *path, | |
| | | const AdgPrimitive | |
| | | *primitive) | |
| | | ; | |
| | | void adg_path_append_segment (AdgPath *path, | |
| | | const AdgSegment | |
| | | *segment); | |
| void adg_path_append_cairo_path (AdgPath *path, | | void adg_path_append_cairo_path (AdgPath *path, | |
|
| const cairo_path_t *cairo_ | | const cairo_path_t | |
| path); | | *cairo_path | |
| | | ); | |
| void adg_path_move_to (AdgPath *path, | | void adg_path_move_to (AdgPath *path, | |
| gdouble x, | | gdouble x, | |
| gdouble y); | | gdouble y); | |
| void adg_path_line_to (AdgPath *path, | | void adg_path_line_to (AdgPath *path, | |
| gdouble x, | | gdouble x, | |
| gdouble y); | | gdouble y); | |
| void adg_path_arc_to (AdgPath *path, | | void adg_path_arc_to (AdgPath *path, | |
| gdouble x1, | | gdouble x1, | |
| gdouble y1, | | gdouble y1, | |
| gdouble x2, | | gdouble x2, | |
| | | | |
| skipping to change at line 96 | | skipping to change at line 106 | |
| 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, | |
| 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, | |
| | | gdouble delta1, | |
| | | gdouble delta2); | |
| | | void adg_path_fillet (AdgPath *path, | |
| | | gdouble radius); | |
| | | | |
| void adg_path_dump (AdgPath *path); | | void adg_path_dump (AdgPath *path); | |
| | | | |
| G_END_DECLS | | G_END_DECLS | |
| | | | |
| #endif /* __ADG_PATH_H__ */ | | #endif /* __ADG_PATH_H__ */ | |
| | | | |
End of changes. 7 change blocks. |
| 7 lines changed or deleted | | 21 lines changed or added | |
|
| adg.h | | adg.h | |
| | | | |
| skipping to change at line 34 | | skipping to change at line 34 | |
| #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-entity.h> | | #include <adg/adg-entity.h> | |
| #include <adg/adg-enums.h> | | #include <adg/adg-enums.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-primitive.h> | |
| #include <adg/adg-rotable.h> | | #include <adg/adg-rotable.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-translatable.h> | | #include <adg/adg-translatable.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> | |
| | | | |
| #endif /* __ADG_H__ */ | | #endif /* __ADG_H__ */ | |
| | | | |
End of changes. 3 change blocks. |
| 0 lines changed or deleted | | 3 lines changed or added | |
|
| cpml-arc.h | | cpml-arc.h | |
| | | | |
| skipping to change at line 42 | | skipping to change at line 42 | |
| | | | |
| 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); | |
| 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, | |
| | | const CpmlPair *pair); | |
| int cpml_arc_intersection (const CpmlPrimitive *arc, | | int cpml_arc_intersection (const CpmlPrimitive *arc, | |
| const CpmlPrimitive *arc2, | | const CpmlPrimitive *arc2, | |
|
| CpmlPair *dest); | | CpmlPair *dest, | |
| | | int max); | |
| int cpml_arc_intersection_with_line (const CpmlPrimitive *arc, | | int cpml_arc_intersection_with_line (const CpmlPrimitive *arc, | |
| const CpmlPrimitive *line, | | const CpmlPrimitive *line, | |
|
| CpmlPair *dest); | | CpmlPair *dest, | |
| | | int max); | |
| void cpml_arc_offset (CpmlPrimitive *arc, | | void cpml_arc_offset (CpmlPrimitive *arc, | |
| double offset); | | double offset); | |
| void cpml_arc_to_cairo (const CpmlPrimitive *arc, | | void cpml_arc_to_cairo (const CpmlPrimitive *arc, | |
| cairo_t *cr); | | cairo_t *cr); | |
| void cpml_arc_to_curves (const CpmlPrimitive *arc, | | void cpml_arc_to_curves (const CpmlPrimitive *arc, | |
| CpmlSegment *segment, | | CpmlSegment *segment, | |
| int n_curves); | | int n_curves); | |
| | | | |
| CAIRO_END_DECLS | | CAIRO_END_DECLS | |
| | | | |
| | | | |
End of changes. 4 change blocks. |
| 2 lines changed or deleted | | 7 lines changed or added | |
|
| cpml-curve.h | | cpml-curve.h | |
| | | | |
| skipping to change at line 29 | | skipping to change at line 29 | |
| | | | |
| #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-macros.h> | | #include <cpml/cpml-macros.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); | |
| 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 time); | |
| 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, | |
| | | const CpmlPair *pair); | |
| int cpml_curve_intersection (const CpmlPrimitive *curve, | | int cpml_curve_intersection (const CpmlPrimitive *curve, | |
| const CpmlPrimitive *curve2, | | const CpmlPrimitive *curve2, | |
|
| CpmlPair *dest); | | CpmlPair *dest, | |
| | | int max); | |
| int cpml_curve_intersection_with_arc(const CpmlPrimitive *curve, | | int cpml_curve_intersection_with_arc(const CpmlPrimitive *curve, | |
| const CpmlPrimitive *arc, | | const CpmlPrimitive *arc, | |
|
| CpmlPair *dest); | | CpmlPair *dest, | |
| | | int max); | |
| int cpml_curve_intersection_with_line | | int cpml_curve_intersection_with_line | |
| (const CpmlPrimitive *curve, | | (const CpmlPrimitive *curve, | |
| const CpmlPrimitive *line, | | const CpmlPrimitive *line, | |
|
| CpmlPair *dest); | | CpmlPair *dest, | |
| | | int max); | |
| void cpml_curve_offset (CpmlPrimitive *curve, | | void cpml_curve_offset (CpmlPrimitive *curve, | |
| double offset); | | double offset); | |
| | | | |
| CAIRO_END_DECLS | | CAIRO_END_DECLS | |
| | | | |
| #endif /* __CPML_CURVE_H__ */ | | #endif /* __CPML_CURVE_H__ */ | |
| | | | |
End of changes. 5 change blocks. |
| 3 lines changed or deleted | | 9 lines changed or added | |
|
| cpml-line.h | | cpml-line.h | |
| | | | |
| skipping to change at line 29 | | skipping to change at line 29 | |
| | | | |
| #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-macros.h> | | #include <cpml/cpml-macros.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); | |
| 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, | |
| | | const CpmlPair *pair); | |
| int cpml_line_intersection (const CpmlPrimitive *line, | | int cpml_line_intersection (const CpmlPrimitive *line, | |
| const CpmlPrimitive *line2, | | const CpmlPrimitive *line2, | |
|
| CpmlPair *dest); | | CpmlPair *dest, | |
| | | int max); | |
| void cpml_line_offset (CpmlPrimitive *line, | | void cpml_line_offset (CpmlPrimitive *line, | |
| double offset); | | double offset); | |
| | | | |
| CAIRO_END_DECLS | | CAIRO_END_DECLS | |
| | | | |
| #endif /* __CPML_LINE_H__ */ | | #endif /* __CPML_LINE_H__ */ | |
| | | | |
End of changes. 3 change blocks. |
| 1 lines changed or deleted | | 5 lines changed or added | |
|
| cpml-primitive.h | | cpml-primitive.h | |
| | | | |
| skipping to change at line 29 | | skipping to change at line 29 | |
| | | | |
| #ifndef __CPML_PRIMITIVE_H__ | | #ifndef __CPML_PRIMITIVE_H__ | |
| #define __CPML_PRIMITIVE_H__ | | #define __CPML_PRIMITIVE_H__ | |
| | | | |
| #include <cpml/cpml-segment.h> | | #include <cpml/cpml-segment.h> | |
| #include <cpml/cpml-pair.h> | | #include <cpml/cpml-pair.h> | |
| | | | |
| CAIRO_BEGIN_DECLS | | CAIRO_BEGIN_DECLS | |
| | | | |
| typedef struct _CpmlPrimitive CpmlPrimitive; | | typedef struct _CpmlPrimitive CpmlPrimitive; | |
|
| | | typedef cairo_path_data_type_t CpmlPrimitiveType; | |
| | | | |
| struct _CpmlPrimitive { | | struct _CpmlPrimitive { | |
| CpmlSegment *segment; | | CpmlSegment *segment; | |
| cairo_path_data_t *org; | | cairo_path_data_t *org; | |
| cairo_path_data_t *data; | | cairo_path_data_t *data; | |
| }; | | }; | |
| | | | |
| CpmlPrimitive * | | CpmlPrimitive * | |
| cpml_primitive_copy (CpmlPrimitive *primitive, | | cpml_primitive_copy (CpmlPrimitive *primitive, | |
| const CpmlPrimitive *src); | | const CpmlPrimitive *src); | |
| | | | |
| skipping to change at line 61 | | skipping to change at line 62 | |
| cairo_t *cr); | | cairo_t *cr); | |
| void cpml_primitive_dump (const CpmlPrimitive *primitive, | | void cpml_primitive_dump (const CpmlPrimitive *primitive, | |
| 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 (cairo_path_data_type_t type); | | int cpml_primitive_type_get_npoints (CpmlPrimitiveType type); | |
| | | double cpml_primitive_length (const CpmlPrimitive *primitive) | |
| | | ; | |
| 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, | |
| | | const CpmlPair *pair); | |
| cairo_bool_t | | cairo_bool_t | |
| cpml_primitive_join (CpmlPrimitive *primitive, | | cpml_primitive_join (CpmlPrimitive *primitive, | |
| CpmlPrimitive *primitive2
); | | CpmlPrimitive *primitive2
); | |
| int cpml_primitive_intersection (const CpmlPrimitive *primitive, | | int cpml_primitive_intersection (const CpmlPrimitive *primitive, | |
| const CpmlPrimitive *primitive2
, | | const CpmlPrimitive *primitive2
, | |
|
| CpmlPair *dest); | | CpmlPair *dest, | |
| | | int max); | |
| void cpml_primitive_offset (CpmlPrimitive *primitive, | | void cpml_primitive_offset (CpmlPrimitive *primitive, | |
| double offset); | | double offset); | |
| | | | |
| CAIRO_END_DECLS | | CAIRO_END_DECLS | |
| | | | |
| #endif /* __CPML_PRIMITIVE_H__ */ | | #endif /* __CPML_PRIMITIVE_H__ */ | |
| | | | |
End of changes. 4 change blocks. |
| 2 lines changed or deleted | | 8 lines changed or added | |
|
| cpml-segment.h | | cpml-segment.h | |
| | | | |
| skipping to change at line 28 | | skipping to change at line 28 | |
| */ | | */ | |
| | | | |
| #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-pair.h> | |
| | | | |
| CAIRO_BEGIN_DECLS | | CAIRO_BEGIN_DECLS | |
| | | | |
|
| | | typedef cairo_path_t CpmlPath; | |
| typedef struct _CpmlSegment CpmlSegment; | | typedef struct _CpmlSegment CpmlSegment; | |
| | | | |
| struct _CpmlSegment { | | struct _CpmlSegment { | |
|
| cairo_path_t *cairo_path; | | CpmlPath *path; | |
| cairo_path_data_t *data; | | cairo_path_data_t *data; | |
| int num_data; | | int num_data; | |
|
| | | | |
| }; | | }; | |
| | | | |
| cairo_bool_t | | cairo_bool_t | |
| cpml_segment_from_cairo (CpmlSegment *segment, | | cpml_segment_from_cairo (CpmlSegment *segment, | |
|
| cairo_path_t *cairo_path
); | | CpmlPath *path); | |
| CpmlSegment * | | CpmlSegment * | |
| cpml_segment_copy (CpmlSegment *segment, | | cpml_segment_copy (CpmlSegment *segment, | |
| const CpmlSegment *src); | | const CpmlSegment *src); | |
| | | | |
| 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 | |
| | | | |
End of changes. 4 change blocks. |
| 3 lines changed or deleted | | 3 lines changed or added | |
|