From 46584e01a8acfb43bb4af1b4e3b89b5cb5ebe246 Mon Sep 17 00:00:00 2001 From: Andrea Canciani Date: Fri, 22 Oct 2010 13:41:51 +0200 Subject: [PATCH] box: Add box header Add a new header implementing very simple box functions: - initialization with the two extrema - extension with a point - in/out test --- src/cairo-box-private.h | 75 +++++++++++++++++++++++++++++++++++++++++ src/cairo-path-fixed.c | 1 + src/cairo-path-stroke.c | 1 + src/cairo-rectangle.c | 11 ++---- src/cairoint.h | 4 --- 5 files changed, 79 insertions(+), 13 deletions(-) create mode 100644 src/cairo-box-private.h diff --git a/src/cairo-box-private.h b/src/cairo-box-private.h new file mode 100644 index 000000000..3bced9966 --- /dev/null +++ b/src/cairo-box-private.h @@ -0,0 +1,75 @@ +/* -*- Mode: c; tab-width: 8; c-basic-offset: 4; indent-tabs-mode: t; -*- */ +/* cairo - a vector graphics library with display and print output + * + * Copyright © 2010 Andrea Canciani + * + * This library is free software; you can redistribute it and/or + * modify it either under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation + * (the "LGPL") or, at your option, under the terms of the Mozilla + * Public License Version 1.1 (the "MPL"). If you do not alter this + * notice, a recipient may use your version of this file under either + * the MPL or the LGPL. + * + * You should have received a copy of the LGPL along with this library + * in the file COPYING-LGPL-2.1; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA + * You should have received a copy of the MPL along with this library + * in the file COPYING-MPL-1.1 + * + * The contents of this file are subject to the Mozilla Public License + * Version 1.1 (the "License"); you may not use this file except in + * compliance with the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY + * OF ANY KIND, either express or implied. See the LGPL or the MPL for + * the specific language governing rights and limitations. + * + * The Original Code is the cairo graphics library. + * + * Contributor(s): + * Andrea Canciani + */ + +#ifndef CAIRO_BOX_H +#define CAIRO_BOX_H + +#include "cairo-types-private.h" +#include "cairo-compiler-private.h" + +static inline void +_cairo_box_set (cairo_box_t *box, + const cairo_point_t *p1, + const cairo_point_t *p2) +{ + box->p1 = *p1; + box->p2 = *p2; +} + +/* assumes box->p1 is top-left, p2 bottom-right */ +static inline void +_cairo_box_add_point (cairo_box_t *box, + const cairo_point_t *point) +{ + if (point->x < box->p1.x) + box->p1.x = point->x; + else if (point->x > box->p2.x) + box->p2.x = point->x; + + if (point->y < box->p1.y) + box->p1.y = point->y; + else if (point->y > box->p2.y) + box->p2.y = point->y; +} + +/* assumes box->p1 is top-left, p2 bottom-right */ +static inline cairo_bool_t +_cairo_box_contains_point (cairo_box_t *box, + const cairo_point_t *point) +{ + return box->p1.x <= point->x && point->x <= box->p2.x && + box->p1.y <= point->y && point->y <= box->p2.y; +} + +#endif /* CAIRO_BOX_H */ diff --git a/src/cairo-path-fixed.c b/src/cairo-path-fixed.c index 3ab00be86..38484f0a4 100644 --- a/src/cairo-path-fixed.c +++ b/src/cairo-path-fixed.c @@ -38,6 +38,7 @@ #include "cairoint.h" +#include "cairo-box-private.h" #include "cairo-error-private.h" #include "cairo-path-fixed-private.h" #include "cairo-slope-private.h" diff --git a/src/cairo-path-stroke.c b/src/cairo-path-stroke.c index a31ac67c7..cdf22ce76 100644 --- a/src/cairo-path-stroke.c +++ b/src/cairo-path-stroke.c @@ -39,6 +39,7 @@ #define _BSD_SOURCE /* for hypot() */ #include "cairoint.h" +#include "cairo-box-private.h" #include "cairo-boxes-private.h" #include "cairo-error-private.h" #include "cairo-path-fixed-private.h" diff --git a/src/cairo-rectangle.c b/src/cairo-rectangle.c index 185c75c0a..cb82ea5c3 100644 --- a/src/cairo-rectangle.c +++ b/src/cairo-rectangle.c @@ -39,6 +39,8 @@ #include "cairoint.h" +#include "cairo-box-private.h" + cairo_private void _cairo_box_from_doubles (cairo_box_t *box, double *x1, double *y1, @@ -260,12 +262,3 @@ _cairo_box_intersects_line_segment (cairo_box_t *box, cairo_line_t *line) return FALSE; } - -cairo_bool_t -_cairo_box_contains_point (cairo_box_t *box, const cairo_point_t *point) -{ - if (point->x < box->p1.x || point->x > box->p2.x || - point->y < box->p1.y || point->y > box->p2.y) - return FALSE; - return TRUE; -} diff --git a/src/cairoint.h b/src/cairoint.h index a0d988c84..6d4da899b 100644 --- a/src/cairoint.h +++ b/src/cairoint.h @@ -291,10 +291,6 @@ cairo_private cairo_bool_t _cairo_box_intersects_line_segment (cairo_box_t *box, cairo_line_t *line) cairo_pure; -cairo_private cairo_bool_t -_cairo_box_contains_point (cairo_box_t *box, - const cairo_point_t *point) cairo_pure; - /* cairo-array.c structures and functions */ cairo_private void