From 8a0fc656de2e9e6f9ea22bd1f7688e9f0c7b36da Mon Sep 17 00:00:00 2001 From: ellson Date: Tue, 18 Oct 2005 18:30:22 +0000 Subject: [PATCH] avoiding dependencies on pathplan --- lib/common/geom.h | 10 +++++----- lib/common/render.h | 2 +- lib/gvc/gvconfig.c | 1 - lib/gvc/gvcontext.c | 1 - lib/gvc/gvdevice.c | 1 - lib/gvc/gvjobs.c | 1 - lib/gvc/gvlayout.c | 1 - lib/gvc/gvplugin.c | 1 - lib/gvc/gvrender.c | 1 - lib/gvc/gvtextlayout.c | 1 - lib/gvc/gvusershape.c | 1 - 11 files changed, 6 insertions(+), 15 deletions(-) diff --git a/lib/common/geom.h b/lib/common/geom.h index e52f0f729..c606a9e3a 100644 --- a/lib/common/geom.h +++ b/lib/common/geom.h @@ -26,13 +26,14 @@ extern "C" { #endif -typedef struct point { int x, y; } point; +typedef struct { int x, y; } point; -typedef Ppoint_t pointf; +typedef struct pointf_s { double x, y; } pointf; +#define HAVE_POINTF_S -typedef struct box { point LL, UR; } box; +typedef struct { point LL, UR; } box; -typedef struct boxf { pointf LL, UR; } boxf; +typedef struct { pointf LL, UR; } boxf; #ifdef MIN #undef MIN @@ -121,7 +122,6 @@ extern boolean boxf_contains(boxf, boxf); extern box flip_rec_box(box b, point p); extern int lineToBox(pointf p1, pointf p2, boxf b); -extern double dist2(pointf p, pointf q); extern point ccwrotatep(point p, int ccwrot); extern pointf ccwrotatepf(pointf p, int ccwrot); diff --git a/lib/common/render.h b/lib/common/render.h index f4ead6837..0454b89f4 100644 --- a/lib/common/render.h +++ b/lib/common/render.h @@ -50,8 +50,8 @@ #endif #include "logic.h" -#include "pathplan.h" #include "geom.h" +#include "pathplan.h" #include "macros.h" #include "const.h" #include "types.h" diff --git a/lib/gvc/gvconfig.c b/lib/gvc/gvconfig.c index 2d5631a4a..2b3079935 100644 --- a/lib/gvc/gvconfig.c +++ b/lib/gvc/gvconfig.c @@ -30,7 +30,6 @@ #endif #include "logic.h" -#include "pathplan.h" #include "geom.h" #include "macros.h" #include "const.h" diff --git a/lib/gvc/gvcontext.c b/lib/gvc/gvcontext.c index e5ce0c843..7bf67158e 100644 --- a/lib/gvc/gvcontext.c +++ b/lib/gvc/gvcontext.c @@ -30,7 +30,6 @@ #include #include "logic.h" -#include "pathplan.h" #include "geom.h" #include "macros.h" #include "types.h" diff --git a/lib/gvc/gvdevice.c b/lib/gvc/gvdevice.c index fc88f04da..a0df29f30 100644 --- a/lib/gvc/gvdevice.c +++ b/lib/gvc/gvdevice.c @@ -28,7 +28,6 @@ #include #include "logic.h" -#include "pathplan.h" #include "geom.h" #include "const.h" #include "types.h" diff --git a/lib/gvc/gvjobs.c b/lib/gvc/gvjobs.c index 1237b9b65..d7d263e83 100644 --- a/lib/gvc/gvjobs.c +++ b/lib/gvc/gvjobs.c @@ -22,7 +22,6 @@ #include #include "logic.h" -#include "pathplan.h" #include "geom.h" #include "types.h" #include "gvplugin.h" diff --git a/lib/gvc/gvlayout.c b/lib/gvc/gvlayout.c index b3760f269..16ede4ae5 100644 --- a/lib/gvc/gvlayout.c +++ b/lib/gvc/gvlayout.c @@ -26,7 +26,6 @@ #include #include "logic.h" -#include "pathplan.h" #include "geom.h" #include "const.h" #include "types.h" diff --git a/lib/gvc/gvplugin.c b/lib/gvc/gvplugin.c index 9ef064393..18051aac1 100644 --- a/lib/gvc/gvplugin.c +++ b/lib/gvc/gvplugin.c @@ -27,7 +27,6 @@ #endif #include "logic.h" -#include "pathplan.h" #include "geom.h" #include "types.h" #include "macros.h" diff --git a/lib/gvc/gvrender.c b/lib/gvc/gvrender.c index 522c04fb0..d2205289e 100644 --- a/lib/gvc/gvrender.c +++ b/lib/gvc/gvrender.c @@ -30,7 +30,6 @@ #include #include "logic.h" -#include "pathplan.h" #include "geom.h" #include "const.h" #include "types.h" diff --git a/lib/gvc/gvtextlayout.c b/lib/gvc/gvtextlayout.c index 246c4d495..c6f5b5eb0 100644 --- a/lib/gvc/gvtextlayout.c +++ b/lib/gvc/gvtextlayout.c @@ -25,7 +25,6 @@ #include #include "logic.h" -#include "pathplan.h" #include "geom.h" #include "const.h" #include "types.h" diff --git a/lib/gvc/gvusershape.c b/lib/gvc/gvusershape.c index 2c374d01a..4ce4fadb4 100644 --- a/lib/gvc/gvusershape.c +++ b/lib/gvc/gvusershape.c @@ -38,7 +38,6 @@ #include #include "logic.h" -#include "pathplan.h" #include "geom.h" #include "const.h" #include "types.h" -- 2.40.0