adg-entity.h   adg-entity.h 
skipping to change at line 79 skipping to change at line 79
AdgContainer * (*get_parent) (AdgEntity *entity); AdgContainer * (*get_parent) (AdgEntity *entity);
void (*set_parent) (AdgEntity *entity, void (*set_parent) (AdgEntity *entity,
AdgContainer *parent); AdgContainer *parent);
AdgContext * (*get_context) (AdgEntity *entity); AdgContext * (*get_context) (AdgEntity *entity);
const AdgMatrix * (*get_model_matrix) (AdgEntity *entity); const AdgMatrix * (*get_model_matrix) (AdgEntity *entity);
const AdgMatrix * (*get_paper_matrix) (AdgEntity *entity); const AdgMatrix * (*get_paper_matrix) (AdgEntity *entity);
}; };
#define ADG_CALLBACK(f) ((AdgCallback) (f)) #define ADG_CALLBACK(f) ((AdgCallback) (f))
typedef void (*AdgCallback) (AdgEntity *entity, cairo_t *cr); typedef void (*AdgCallback)(AdgEntity *entity, cairo_t *cr, gpointer user_d ata);
GType adg_entity_get_type (void) G_GNUC_CONST; GType adg_entity_get_type (void) G_GNUC_CONST;
AdgCanvas * adg_entity_get_canvas (AdgEntity *entity); AdgCanvas * adg_entity_get_canvas (AdgEntity *entity);
AdgContainer * adg_entity_get_parent (AdgEntity *entity); AdgContainer * adg_entity_get_parent (AdgEntity *entity);
void adg_entity_set_parent (AdgEntity *entity, void adg_entity_set_parent (AdgEntity *entity,
AdgContainer *parent); AdgContainer *parent);
void adg_entity_unparent (AdgEntity *entity); void adg_entity_unparent (AdgEntity *entity);
void adg_entity_reparent (AdgEntity *entity, void adg_entity_reparent (AdgEntity *entity,
AdgContainer *parent); AdgContainer *parent);
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 adg-path.h   adg-path.h 
skipping to change at line 53 skipping to change at line 53
}; };
struct _AdgPathClass { struct _AdgPathClass {
AdgEntityClass parent_class; AdgEntityClass parent_class;
/* Virtual table */ /* Virtual table */
void (*clear) (AdgPath *path); void (*clear) (AdgPath *path);
}; };
GType adg_path_get_type (void) G_GNUC_CONST; GType adg_path_get_type (void) G_GNUC_CONST;
AdgEntity * adg_path_new (AdgCallback callback); AdgEntity * adg_path_new (AdgCallback callback,
gpointer user_data)
;
const cairo_path_t * const cairo_path_t *
adg_path_get_cairo_path (AdgPath *path); adg_path_get_cairo_path (AdgPath *path);
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. 1 change blocks. 
1 lines changed or deleted 3 lines changed or added


 adg-util.h   adg-util.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_UTIL_H__ #ifndef __ADG_UTIL_H__
#define __ADG_UTIL_H__ #define __ADG_UTIL_H__
#include <glib.h> #include <glib.h>
#include <cairo.h> #include <cairo.h>
#include <math.h> #include <math.h>
#define ADG_DIR_RIGHT 0.
#define ADG_DIR_DOWN M_PI_2
#define ADG_DIR_LEFT M_PI
#define ADG_DIR_UP (M_PI_2 * 3.)
#define ADG_ISSET(flags,mask) (((flags) & (mask)) != 0 ? TRUE : FALSE) #define ADG_ISSET(flags,mask) (((flags) & (mask)) != 0 ? TRUE : FALSE)
#define ADG_SET(flags,mask) G_STMT_START{ (flags) |= (mask); }G_STMT_EN D #define ADG_SET(flags,mask) G_STMT_START{ (flags) |= (mask); }G_STMT_EN D
#define ADG_UNSET(flags,mask) G_STMT_START{ (flags) &= ~(mask); }G_STMT_E ND #define ADG_UNSET(flags,mask) G_STMT_START{ (flags) &= ~(mask); }G_STMT_E ND
#define ADG_CHECKPOINT_WITH_MESSAGE(message) \ #define ADG_CHECKPOINT_WITH_MESSAGE(message) \
g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, \ g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, \
"file `%s' at line %d: %s", \ "file `%s' at line %d: %s", \
__FILE__, __LINE__, #message) __FILE__, __LINE__, #message)
#define ADG_CHECKPOINT() ADG_CHECKPOINT_WITH_MESSAGE ("check point") #define ADG_CHECKPOINT() ADG_CHECKPOINT_WITH_MESSAGE ("check point")
 End of changes. 1 change blocks. 
0 lines changed or deleted 5 lines changed or added


 cpml-pair.h   cpml-pair.h 
/* CPML - Cairo Path Manipulation Library /* CPML - Cairo Path Manipulation Library
* Copyright (C) 2008, Nicola Fontana <ntd at entidi.it> * Copyright (C) 2008, 2009 Nicola Fontana <ntd at entidi.it>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public * modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either * License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version. * version 2 of the License, or (at your option) any later version.
* *
* This library is distributed in the hope that it will be useful, * This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details. * Lesser General Public License for more details.
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_PAIR_H__ #ifndef __CPML_PAIR_H__
#define __CPML_PAIR_H__ #define __CPML_PAIR_H__
#include <cairo.h> #include <cairo.h>
#include <math.h>
#define CPML_DIR_RIGHT 0.
#define CPML_DIR_DOWN (M_PI/2.)
#define CPML_DIR_LEFT M_PI
#define CPML_DIR_UP (M_PI*3./2.)
CAIRO_BEGIN_DECLS CAIRO_BEGIN_DECLS
typedef struct _CpmlPair CpmlPair; typedef struct _CpmlPair CpmlPair;
typedef struct _CpmlPair CpmlVector;
struct _CpmlPair { struct _CpmlPair {
double x, y; double x, y;
}; };
cairo_bool_t cpml_pair_copy (CpmlPair *pair, CpmlPair * cpml_pair_copy (CpmlPair *pair,
const CpmlPair *src); const CpmlPair *src);
cairo_bool_t cpml_pair_transform (CpmlPair *pair, CpmlPair * cpml_pair_from_cairo (CpmlPair *pair,
const cairo_matrix_t *matr const cairo_path_data_t
ix); *path_data)
cairo_bool_t cpml_pair_distance (double *distance, ;
const CpmlPair *from,
const CpmlPair *to); void cpml_pair_negate (CpmlPair *pair);
cairo_bool_t cpml_pair_square_distance (double *distance, cairo_bool_t cpml_pair_invert (CpmlPair *pair);
const CpmlPair *from, void cpml_pair_add (CpmlPair *pair,
const CpmlPair *src);
void cpml_pair_sub (CpmlPair *pair,
const CpmlPair *src);
void cpml_pair_mul (CpmlPair *pair,
const CpmlPair *src);
cairo_bool_t cpml_pair_div (CpmlPair *pair,
const CpmlPair *src);
void cpml_pair_transform (CpmlPair *pair,
const cairo_matrix_t
*matrix);
double cpml_pair_squared_distance (const CpmlPair *from,
const CpmlPair *to); const CpmlPair *to);
cairo_bool_t cpml_pair_angle (double *angle, double cpml_pair_distance (const CpmlPair *from,
const CpmlPair *from,
const CpmlPair *to); const CpmlPair *to);
cairo_bool_t cpml_vector_from_pair (CpmlPair *vector,
const CpmlPair *pair); CpmlVector * cpml_vector_from_angle (CpmlVector *vector,
cairo_bool_t cpml_vector_from_angle (CpmlPair *vector, double angle,
double angle); double length);
void cpml_vector_set_length (CpmlVector *vector,
double length);
double cpml_vector_angle (const CpmlVector
*vector);
void cpml_vector_normal (CpmlVector *vector);
void cpml_pair_to_cairo (const CpmlPair *pair,
cairo_path_data_t
*path_data)
;
CAIRO_END_DECLS CAIRO_END_DECLS
#endif /* __CPML_PAIR_H__ */ #endif /* __CPML_PAIR_H__ */
 End of changes. 8 change blocks. 
24 lines changed or deleted 39 lines changed or added


 cpml-segment.h   cpml-segment.h 
/* CPML - Cairo Path Manipulation Library /* CPML - Cairo Path Manipulation Library
* Copyright (C) 2008, Nicola Fontana <ntd at entidi.it> * Copyright (C) 2008, 2009 Nicola Fontana <ntd at entidi.it>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public * modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either * License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version. * version 2 of the License, or (at your option) any later version.
* *
* This library is distributed in the hope that it will be useful, * This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details. * Lesser General Public License for more details.
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>
CAIRO_BEGIN_DECLS CAIRO_BEGIN_DECLS
typedef struct _CpmlSegment CpmlSegment; typedef struct _CpmlSegment CpmlSegment;
struct _CpmlSegment { struct _CpmlSegment {
cairo_path_t path; cairo_path_t *cairo_path;
cairo_path_t *original; cairo_path_data_t *data;
int num_data;
}; };
cairo_bool_t cpml_segment_init (CpmlSegment *segmen cairo_bool_t
t, cpml_segment_from_cairo (CpmlSegment *segment,
cairo_path_t *src); cairo_path_t *cairo_path
CpmlSegment * cpml_segment_copy (CpmlSegment *segmen );
t, CpmlSegment *
const CpmlSegment *src); cpml_segment_copy (CpmlSegment *segment,
void cpml_segment_dump (const CpmlSegment *segmen const CpmlSegment *src);
t);
void cpml_segment_reset (CpmlSegment *segmen void cpml_segment_to_cairo (const CpmlSegment *segment,
t); cairo_t *cr);
cairo_bool_t cpml_segment_next (CpmlSegment *segmen void cpml_segment_dump (const CpmlSegment *segment);
t);
void cpml_segment_reverse (CpmlSegment *segmen void cpml_segment_reset (CpmlSegment *segment);
t); cairo_bool_t
void cpml_segment_transform (CpmlSegment *segmen cpml_segment_next (CpmlSegment *segment);
t,
const cairo_matrix_t *matr void cpml_segment_reverse (CpmlSegment *segment);
ix); void cpml_segment_transform (CpmlSegment *segment,
const cairo_matrix_t *matrix);
int cpml_segment_intersection (const CpmlSegment *segment,
const CpmlSegment *segment2,
CpmlPair *dest,
int max);
void cpml_segment_offset (CpmlSegment *segment,
double offset);
CAIRO_END_DECLS CAIRO_END_DECLS
#endif /* __CPML_SEGMENT_H__ */ #endif /* __CPML_SEGMENT_H__ */
 End of changes. 4 change blocks. 
21 lines changed or deleted 31 lines changed or added


 cpml.h   cpml.h 
/* CPML - Cairo Path Manipulation Library /* CPML - Cairo Path Manipulation Library
* Copyright (C) 2008, Nicola Fontana <ntd at entidi.it> * Copyright (C) 2008, 2009 Nicola Fontana <ntd at entidi.it>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public * modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either * License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version. * version 2 of the License, or (at your option) any later version.
* *
* This library is distributed in the hope that it will be useful, * This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details. * Lesser General Public License for more details.
* *
* 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_H__ #ifndef __CPML_H__
#define __CPML_H__ #define __CPML_H__
#include <cpml/cpml-curve.h>
#include <cpml/cpml-line.h>
#include <cpml/cpml-macros.h>
#include <cpml/cpml-pair.h> #include <cpml/cpml-pair.h>
#include <cpml/cpml-primitive.h>
#include <cpml/cpml-segment.h> #include <cpml/cpml-segment.h>
#endif /* __CPML_H__ */ #endif /* __CPML_H__ */
 End of changes. 3 change blocks. 
1 lines changed or deleted 5 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/