gaiageo.h   gaiageo.h 
skipping to change at line 279 skipping to change at line 279
double M; /* M measure */ double M; /* M measure */
int DimensionModel; /* (x,y), (x,y,z), (x,y,m) or (x,y,z,m) */ int DimensionModel; /* (x,y), (x,y,z), (x,y,m) or (x,y,z,m) */
struct gaiaPointStruct *Next; /* for double-linked list */ struct gaiaPointStruct *Next; /* for double-linked list */
struct gaiaPointStruct *Prev; /* for double-linked list */ struct gaiaPointStruct *Prev; /* for double-linked list */
} gaiaPoint; } gaiaPoint;
typedef gaiaPoint *gaiaPointPtr; typedef gaiaPoint *gaiaPointPtr;
typedef struct gaiaDynamicLineStruct typedef struct gaiaDynamicLineStruct
{ {
/* a generic DYNAMIC LINE object */ /* a generic DYNAMIC LINE object */
int Error;
int Srid;
gaiaPointPtr First; /* Points linked list - first */ gaiaPointPtr First; /* Points linked list - first */
gaiaPointPtr Last; /* Points linked list - last */ gaiaPointPtr Last; /* Points linked list - last */
} gaiaDynamicLine; } gaiaDynamicLine;
typedef gaiaDynamicLine *gaiaDynamicLinePtr; typedef gaiaDynamicLine *gaiaDynamicLinePtr;
typedef struct gaiaLinestringStruct typedef struct gaiaLinestringStruct
{ {
/* an OpenGis LINESTRING */ /* an OpenGis LINESTRING */
int Points; /* number of vertices */ int Points; /* number of vertices */
double *Coords; /* X,Y [vertices] array */ double *Coords; /* X,Y [vertices] array */
skipping to change at line 652 skipping to change at line 654
int vert); int vert);
GAIAGEO_DECLARE void gaiaInsertInteriorRing (gaiaPolygonPtr p, GAIAGEO_DECLARE void gaiaInsertInteriorRing (gaiaPolygonPtr p,
gaiaRingPtr ring); gaiaRingPtr ring);
GAIAGEO_DECLARE void gaiaAddRingToPolyg (gaiaPolygonPtr polyg, GAIAGEO_DECLARE void gaiaAddRingToPolyg (gaiaPolygonPtr polyg,
gaiaRingPtr ring); gaiaRingPtr ring);
GAIAGEO_DECLARE gaiaDynamicLinePtr gaiaAllocDynamicLine (void); GAIAGEO_DECLARE gaiaDynamicLinePtr gaiaAllocDynamicLine (void);
GAIAGEO_DECLARE void gaiaFreeDynamicLine (gaiaDynamicLinePtr p); GAIAGEO_DECLARE void gaiaFreeDynamicLine (gaiaDynamicLinePtr p);
GAIAGEO_DECLARE gaiaPointPtr GAIAGEO_DECLARE gaiaPointPtr
gaiaAppendPointToDynamicLine (gaiaDynamicLinePtr p, double x, double y); gaiaAppendPointToDynamicLine (gaiaDynamicLinePtr p, double x, double y);
GAIAGEO_DECLARE gaiaPointPtr GAIAGEO_DECLARE gaiaPointPtr
gaiaAppendPointZToDynamicLine (gaiaDynamicLinePtr p, double x, doubl
e y,
double z);
GAIAGEO_DECLARE gaiaPointPtr
gaiaAppendPointMToDynamicLine (gaiaDynamicLinePtr p, double x, doubl
e y,
double m);
GAIAGEO_DECLARE gaiaPointPtr
gaiaAppendPointZMToDynamicLine (gaiaDynamicLinePtr p, double x,
double y, double z, double m);
GAIAGEO_DECLARE gaiaPointPtr
gaiaPrependPointToDynamicLine (gaiaDynamicLinePtr p, double x, gaiaPrependPointToDynamicLine (gaiaDynamicLinePtr p, double x,
double y); double y);
GAIAGEO_DECLARE gaiaPointPtr
gaiaPrependPointZToDynamicLine (gaiaDynamicLinePtr p, double x,
double y, double z);
GAIAGEO_DECLARE gaiaPointPtr
gaiaPrependPointMToDynamicLine (gaiaDynamicLinePtr p, double x,
double y, double m);
GAIAGEO_DECLARE gaiaPointPtr
gaiaPrependPointZMToDynamicLine (gaiaDynamicLinePtr p, double x,
double y, double z, double m);
GAIAGEO_DECLARE gaiaPointPtr gaiaDynamicLineInsertAfter (gaiaDynamicLin ePtr GAIAGEO_DECLARE gaiaPointPtr gaiaDynamicLineInsertAfter (gaiaDynamicLin ePtr
p, gaiaPointPtr pt, p, gaiaPointPtr pt,
double x, double x,
double y); double y);
GAIAGEO_DECLARE gaiaPointPtr gaiaDynamicLineInsertBefore (gaiaDynamicLi nePtr GAIAGEO_DECLARE gaiaPointPtr gaiaDynamicLineInsertBefore (gaiaDynamicLi nePtr
p, p,
gaiaPointPtr p t, gaiaPointPtr p t,
double x, double x,
double y); double y);
GAIAGEO_DECLARE void gaiaDynamicLineDeletePoint (gaiaDynamicLinePtr p, GAIAGEO_DECLARE void gaiaDynamicLineDeletePoint (gaiaDynamicLinePtr p,
skipping to change at line 826 skipping to change at line 846
int y_axis); int y_axis);
GAIAGEO_DECLARE void gaiaSwapCoords (gaiaGeomCollPtr geom); GAIAGEO_DECLARE void gaiaSwapCoords (gaiaGeomCollPtr geom);
GAIAGEO_DECLARE gaiaGeomCollPtr gaiaCastGeomCollToXY (gaiaGeomCollPtr g eom); GAIAGEO_DECLARE gaiaGeomCollPtr gaiaCastGeomCollToXY (gaiaGeomCollPtr g eom);
GAIAGEO_DECLARE gaiaGeomCollPtr gaiaCastGeomCollToXYZ (gaiaGeomCollPtr GAIAGEO_DECLARE gaiaGeomCollPtr gaiaCastGeomCollToXYZ (gaiaGeomCollPtr
geom); geom);
GAIAGEO_DECLARE gaiaGeomCollPtr gaiaCastGeomCollToXYM (gaiaGeomCollPtr GAIAGEO_DECLARE gaiaGeomCollPtr gaiaCastGeomCollToXYM (gaiaGeomCollPtr
geom); geom);
GAIAGEO_DECLARE gaiaGeomCollPtr gaiaCastGeomCollToXYZM (gaiaGeomCollPtr GAIAGEO_DECLARE gaiaGeomCollPtr gaiaCastGeomCollToXYZM (gaiaGeomCollPtr
geom); geom);
GAIAGEO_DECLARE gaiaGeomCollPtr gaiaCloneGeomColl (gaiaGeomCollPtr geom ); GAIAGEO_DECLARE gaiaGeomCollPtr gaiaCloneGeomColl (gaiaGeomCollPtr geom );
GAIAGEO_DECLARE gaiaGeomCollPtr gaiaCloneGeomCollPoints (gaiaGeomCollPt
r
geom);
GAIAGEO_DECLARE gaiaGeomCollPtr
gaiaCloneGeomCollLinestrings (gaiaGeomCollPtr geom);
GAIAGEO_DECLARE gaiaGeomCollPtr gaiaCloneGeomCollPolygons (gaiaGeomColl
Ptr
geom);
GAIAGEO_DECLARE gaiaLinestringPtr gaiaCloneLinestring (gaiaLinestringPt r GAIAGEO_DECLARE gaiaLinestringPtr gaiaCloneLinestring (gaiaLinestringPt r
line); line);
GAIAGEO_DECLARE gaiaRingPtr gaiaCloneRing (gaiaRingPtr ring); GAIAGEO_DECLARE gaiaRingPtr gaiaCloneRing (gaiaRingPtr ring);
GAIAGEO_DECLARE gaiaPolygonPtr gaiaClonePolygon (gaiaPolygonPtr polyg); GAIAGEO_DECLARE gaiaPolygonPtr gaiaClonePolygon (gaiaPolygonPtr polyg);
GAIAGEO_DECLARE int gaiaLinestringEquals (gaiaLinestringPtr line1, GAIAGEO_DECLARE int gaiaLinestringEquals (gaiaLinestringPtr line1,
gaiaLinestringPtr line2); gaiaLinestringPtr line2);
GAIAGEO_DECLARE int gaiaPolygonEquals (gaiaPolygonPtr geom1, GAIAGEO_DECLARE int gaiaPolygonEquals (gaiaPolygonPtr geom1,
gaiaPolygonPtr geom2); gaiaPolygonPtr geom2);
GAIAGEO_DECLARE void gaiaMakePoint (double x, double y, int srid, GAIAGEO_DECLARE void gaiaMakePoint (double x, double y, int srid,
unsigned char **result, int *size); unsigned char **result, int *size);
GAIAGEO_DECLARE void gaiaMakeLine (gaiaGeomCollPtr geom1,
gaiaGeomCollPtr geom2,
unsigned char **result, int *size);
GAIAGEO_DECLARE gaiaGeomCollPtr gaiaMergeGeometries (gaiaGeomCollPtr ge
om1,
gaiaGeomCollPtr geo
m2);
GAIAGEO_DECLARE void gaiaBuildMbr (double x1, double y1, double x2, GAIAGEO_DECLARE void gaiaBuildMbr (double x1, double y1, double x2,
double y2, int srid, double y2, int srid,
unsigned char **result, int *size); unsigned char **result, int *size);
GAIAGEO_DECLARE void gaiaBuildFilterMbr (double x1, double y1, double x 2, GAIAGEO_DECLARE void gaiaBuildFilterMbr (double x1, double y1, double x 2,
double y2, int mode, double y2, int mode,
unsigned char **result, int *si ze); unsigned char **result, int *si ze);
GAIAGEO_DECLARE int gaiaParseFilterMbr (unsigned char *result, int size , GAIAGEO_DECLARE int gaiaParseFilterMbr (unsigned char *result, int size ,
double *minx, double *miny, double *minx, double *miny,
double *maxx, double *maxy, double *maxx, double *maxy,
int *mode); int *mode);
skipping to change at line 857 skipping to change at line 888
int srid, unsigned char **resul t, int srid, unsigned char **resul t,
int *size); int *size);
GAIAGEO_DECLARE int gaiaGetMbrMinX (const unsigned char *blob, GAIAGEO_DECLARE int gaiaGetMbrMinX (const unsigned char *blob,
unsigned int size, double *minx); unsigned int size, double *minx);
GAIAGEO_DECLARE int gaiaGetMbrMaxX (const unsigned char *blob, GAIAGEO_DECLARE int gaiaGetMbrMaxX (const unsigned char *blob,
unsigned int size, double *maxx); unsigned int size, double *maxx);
GAIAGEO_DECLARE int gaiaGetMbrMinY (const unsigned char *blob, GAIAGEO_DECLARE int gaiaGetMbrMinY (const unsigned char *blob,
unsigned int size, double *miny); unsigned int size, double *miny);
GAIAGEO_DECLARE int gaiaGetMbrMaxY (const unsigned char *blob, GAIAGEO_DECLARE int gaiaGetMbrMaxY (const unsigned char *blob,
unsigned int size, double *maxy); unsigned int size, double *maxy);
GAIAGEO_DECLARE gaiaGeomCollPtr gaiaBuildRings (gaiaGeomCollPtr geom);
GAIAGEO_DECLARE void gaiaFree (void *ptr); GAIAGEO_DECLARE void gaiaFree (void *ptr);
GAIAGEO_DECLARE int gaiaEllipseParams (const char *name, double *a, GAIAGEO_DECLARE int gaiaEllipseParams (const char *name, double *a,
double *b, double *rf); double *b, double *rf);
GAIAGEO_DECLARE double gaiaGreatCircleDistance (double a, double b, GAIAGEO_DECLARE double gaiaGreatCircleDistance (double a, double b,
double lat1, double lon1 , double lat1, double lon1 ,
double lat2, double lon2 ); double lat2, double lon2 );
GAIAGEO_DECLARE double gaiaGeodesicDistance (double a, double b, double rf, GAIAGEO_DECLARE double gaiaGeodesicDistance (double a, double b, double rf,
double lat1, double lon1, double lat1, double lon1,
double lat2, double lon2); double lat2, double lon2);
GAIAGEO_DECLARE double gaiaGreatCircleTotalLength (double a, double b, GAIAGEO_DECLARE double gaiaGreatCircleTotalLength (double a, double b,
skipping to change at line 890 skipping to change at line 920
GAIAGEO_DECLARE int gaiaRingGetPoint (gaiaRingPtr rng, int v, double *x , GAIAGEO_DECLARE int gaiaRingGetPoint (gaiaRingPtr rng, int v, double *x ,
double *y, double *z, double *m); double *y, double *z, double *m);
GAIAGEO_DECLARE int gaiaRingSetPoint (gaiaRingPtr rng, int v, double x, GAIAGEO_DECLARE int gaiaRingSetPoint (gaiaRingPtr rng, int v, double x,
double y, double z, double m); double y, double z, double m);
GAIAGEO_DECLARE gaiaGeomCollPtr gaiaSanitize (gaiaGeomCollPtr org); GAIAGEO_DECLARE gaiaGeomCollPtr gaiaSanitize (gaiaGeomCollPtr org);
GAIAGEO_DECLARE int gaiaIsToxic (gaiaGeomCollPtr org); GAIAGEO_DECLARE int gaiaIsToxic (gaiaGeomCollPtr org);
GAIAGEO_DECLARE void gaiaOutBufferInitialize (gaiaOutBufferPtr buf); GAIAGEO_DECLARE void gaiaOutBufferInitialize (gaiaOutBufferPtr buf);
GAIAGEO_DECLARE void gaiaOutBufferReset (gaiaOutBufferPtr buf); GAIAGEO_DECLARE void gaiaOutBufferReset (gaiaOutBufferPtr buf);
GAIAGEO_DECLARE void gaiaAppendToOutBuffer (gaiaOutBufferPtr buf, GAIAGEO_DECLARE void gaiaAppendToOutBuffer (gaiaOutBufferPtr buf,
const char *text); const char *text);
GAIAGEO_DECLARE gaiaGeomCollPtr gaiaLinearize (gaiaGeomCollPtr geom,
int force_multi);
#ifndef OMIT_PROJ /* including PROJ.4 */ #ifndef OMIT_PROJ /* including PROJ.4 */
GAIAGEO_DECLARE double gaiaRadsToDegs (double rads); GAIAGEO_DECLARE double gaiaRadsToDegs (double rads);
GAIAGEO_DECLARE double gaiaDegsToRads (double degs); GAIAGEO_DECLARE double gaiaDegsToRads (double degs);
GAIAGEO_DECLARE gaiaGeomCollPtr gaiaTransform (gaiaGeomCollPtr org, GAIAGEO_DECLARE gaiaGeomCollPtr gaiaTransform (gaiaGeomCollPtr org,
char *proj_from, char *proj_from,
char *proj_to); char *proj_to);
#endif /* end including PROJ.4 */ #endif /* end including PROJ.4 */
skipping to change at line 966 skipping to change at line 998
double *length); double *length);
GAIAGEO_DECLARE int gaiaGeomCollArea (gaiaGeomCollPtr geom, double *are a); GAIAGEO_DECLARE int gaiaGeomCollArea (gaiaGeomCollPtr geom, double *are a);
GAIAGEO_DECLARE int gaiaIsSimple (gaiaGeomCollPtr geom); GAIAGEO_DECLARE int gaiaIsSimple (gaiaGeomCollPtr geom);
GAIAGEO_DECLARE int gaiaIsClosed (gaiaLinestringPtr line); GAIAGEO_DECLARE int gaiaIsClosed (gaiaLinestringPtr line);
GAIAGEO_DECLARE int gaiaIsRing (gaiaLinestringPtr line); GAIAGEO_DECLARE int gaiaIsRing (gaiaLinestringPtr line);
GAIAGEO_DECLARE int gaiaIsValid (gaiaGeomCollPtr geom); GAIAGEO_DECLARE int gaiaIsValid (gaiaGeomCollPtr geom);
GAIAGEO_DECLARE gaiaGeomCollPtr gaiaConvexHull (gaiaGeomCollPtr geom); GAIAGEO_DECLARE gaiaGeomCollPtr gaiaConvexHull (gaiaGeomCollPtr geom);
GAIAGEO_DECLARE gaiaGeomCollPtr gaiaGeomCollBuffer (gaiaGeomCollPtr geo m, GAIAGEO_DECLARE gaiaGeomCollPtr gaiaGeomCollBuffer (gaiaGeomCollPtr geo m,
double radius, double radius,
int points); int points);
GAIAGEO_DECLARE gaiaGeomCollPtr gaiaPolygonize (gaiaGeomCollPtr geom,
int force_multipolygon);
GAIAGEO_DECLARE void *gaiaToGeos (const gaiaGeomCollPtr gaia); GAIAGEO_DECLARE void *gaiaToGeos (const gaiaGeomCollPtr gaia);
GAIAGEO_DECLARE gaiaGeomCollPtr gaiaFromGeos_XY (const void *geos); GAIAGEO_DECLARE gaiaGeomCollPtr gaiaFromGeos_XY (const void *geos);
GAIAGEO_DECLARE gaiaGeomCollPtr gaiaFromGeos_XYZ (const void *geos); GAIAGEO_DECLARE gaiaGeomCollPtr gaiaFromGeos_XYZ (const void *geos);
GAIAGEO_DECLARE gaiaGeomCollPtr gaiaFromGeos_XYM (const void *geos); GAIAGEO_DECLARE gaiaGeomCollPtr gaiaFromGeos_XYM (const void *geos);
GAIAGEO_DECLARE gaiaGeomCollPtr gaiaFromGeos_XYZM (const void *geos); GAIAGEO_DECLARE gaiaGeomCollPtr gaiaFromGeos_XYZM (const void *geos);
GAIAGEO_DECLARE gaiaGeomCollPtr gaiaPolygonize (gaiaGeomCollPtr geom,
int force_multi);
#ifdef GEOS_ADVANCED
GAIAGEO_DECLARE gaiaGeomCollPtr gaiaOffsetCurve (gaiaGeomCollPtr geom,
double radius, int poin
ts,
int left_right);
GAIAGEO_DECLARE gaiaGeomCollPtr gaiaSharedPaths (gaiaGeomCollPtr geom1,
gaiaGeomCollPtr geom2);
GAIAGEO_DECLARE int gaiaGeomCollCovers (gaiaGeomCollPtr geom1,
gaiaGeomCollPtr geom2);
GAIAGEO_DECLARE int gaiaGeomCollCoveredBy (gaiaGeomCollPtr geom1,
gaiaGeomCollPtr geom2);
#endif /* end GEOS advanced and experimental featur
es */
#endif /* end including GEOS */ #endif /* end including GEOS */
#ifndef OMIT_ICONV /* ICONV enabled: supporting text reader */ #ifndef OMIT_ICONV /* ICONV enabled: supporting text reader */
GAIAGEO_DECLARE gaiaTextReaderPtr gaiaTextReaderAlloc (const char *path , GAIAGEO_DECLARE gaiaTextReaderPtr gaiaTextReaderAlloc (const char *path ,
char field_separa tor, char field_separa tor,
char text_separat or, char text_separat or,
char char
decimal_separator , decimal_separator ,
int int
 End of changes. 9 change blocks. 
3 lines changed or deleted 55 lines changed or added


 spatialite.h   spatialite.h 
skipping to change at line 75 skipping to change at line 75
SPATIALITE_DECLARE int load_shapefile (sqlite3 * sqlite, char *shp_path , SPATIALITE_DECLARE int load_shapefile (sqlite3 * sqlite, char *shp_path ,
char *table, char *charset, int s rid, char *table, char *charset, int s rid,
char *column, int coerce2d, char *column, int coerce2d,
int compressed, int verbose, int compressed, int verbose,
int *rows); int *rows);
SPATIALITE_DECLARE int load_dbf (sqlite3 * sqlite, char *shp_path, SPATIALITE_DECLARE int load_dbf (sqlite3 * sqlite, char *shp_path,
char *table, char *charset, int verbose , char *table, char *charset, int verbose ,
int *rows); int *rows);
SPATIALITE_DECLARE double math_round (double value); SPATIALITE_DECLARE double math_round (double value);
SPATIALITE_DECLARE sqlite3_int64 math_llabs (sqlite3_int64 value); SPATIALITE_DECLARE sqlite3_int64 math_llabs (sqlite3_int64 value);
SPATIALITE_DECLARE void spatial_ref_sys_init (sqlite3 * sqlite, SPATIALITE_DECLARE int spatial_ref_sys_init (sqlite3 * sqlite, int verb
int verbose); ose);
SPATIALITE_DECLARE int dump_kml (sqlite3 * sqlite, char *table,
char *geom_col, char *kml_path,
char *name_col, char *desc_col,
int precision);
SPATIALITE_DECLARE void check_duplicated_rows (sqlite3 * sqlite,
char *table);
SPATIALITE_DECLARE void remove_duplicated_rows (sqlite3 * sqlite,
char *table);
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
#endif /* _SPATIALITE_H */ #endif /* _SPATIALITE_H */
 End of changes. 1 change blocks. 
2 lines changed or deleted 10 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/