Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

clipping.h: Rewrite copyright header to use the "new" style.

Browse Source 
Also trim trailing spaces.

Change-Id: I598dfa2c69f584eaa004211339c73a26dd93af93
Reviewed-on: https://review.haiku-os.org/c/haiku/+/2296
Reviewed-by: Adrien Destugues <pulkomandy@gmail.com>
This commit is contained in:
Augustin Cavalier 2020-02-29 20:20:05 -05:00 committed by Adrien Destugues
parent f816ef57aa
commit 171057c06a
1 changed files with 15 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
headers/private/interface/clipping.h
View File

@ -1,28 +1,10 @@
//------------------------------------------------------------------------------ /*
// Copyright (c) 2001-2004, Haiku, Inc. * Copyright 2001-2004, Haiku, Inc. All rights reserved.
// * Distributed under the terms of the MIT License.
// Permission is hereby granted, free of charge, to any person obtaining a *
// copy of this software and associated documentation files (the "Software"), * Authors:
// to deal in the Software without restriction, including without limitation * Stefano Ceccherini, burton666@libero.it
// the rights to use, copy, modify, merge, publish, distribute, sublicense, */
// and/or sell copies of the Software, and to permit persons to whom the
// Software is furnished to do so, subject to the following conditions:
//
// The above copyright notice and this permission notice shall be included in
// all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE.
//
// File Name: clipping.h
// Author: Stefano Ceccherini (burton666@libero.it)
// Description: Helper methods to manipulate clipping_rects
//------------------------------------------------------------------------------
#ifndef __CLIPPING_H #ifndef __CLIPPING_H
#define __CLIPPING_H #define __CLIPPING_H
@ -43,12 +25,12 @@ static inline clipping_rect
union_rect(const clipping_rect &r1, const clipping_rect &r2) union_rect(const clipping_rect &r1, const clipping_rect &r2)
{ {
clipping_rect rect; clipping_rect rect;
rect.left = min_c(r1.left, r2.left); rect.left = min_c(r1.left, r2.left);
rect.top = min_c(r1.top, r2.top); rect.top = min_c(r1.top, r2.top);
rect.right = max_c(r1.right, r2.right); rect.right = max_c(r1.right, r2.right);
rect.bottom = max_c(r1.bottom, r2.bottom); rect.bottom = max_c(r1.bottom, r2.bottom);
return rect; return rect;
} }
@ -60,12 +42,12 @@ static inline clipping_rect
sect_rect(const clipping_rect &r1, const clipping_rect &r2) sect_rect(const clipping_rect &r1, const clipping_rect &r2)
{ {
clipping_rect rect; clipping_rect rect;
rect.left = max_c(r1.left, r2.left); rect.left = max_c(r1.left, r2.left);
rect.top = max_c(r1.top, r2.top); rect.top = max_c(r1.top, r2.top);
rect.right = min_c(r1.right, r2.right); rect.right = min_c(r1.right, r2.right);
rect.bottom = min_c(r1.bottom, r2.bottom); rect.bottom = min_c(r1.bottom, r2.bottom);
return rect; return rect;
} }
@ -119,7 +101,7 @@ to_clipping_rect(const BRect &rect)
clipRect.top = (int32)rect.top; clipRect.top = (int32)rect.top;
clipRect.right = (int32)rect.right; clipRect.right = (int32)rect.right;
clipRect.bottom = (int32)rect.bottom; clipRect.bottom = (int32)rect.bottom;
return clipRect; return clipRect;
} }
@ -128,7 +110,7 @@ to_clipping_rect(const BRect &rect)
static inline bool static inline bool
point_in(const clipping_rect &rect, int32 px, int32 py) point_in(const clipping_rect &rect, int32 px, int32 py)
{ {
if (px >= rect.left && px <= rect.right if (px >= rect.left && px <= rect.right
&& py >= rect.top && py <= rect.bottom) && py >= rect.top && py <= rect.bottom)
return true; return true;
return false; return false;
@ -139,7 +121,7 @@ point_in(const clipping_rect &rect, int32 px, int32 py)
static inline bool static inline bool
point_in(const clipping_rect &rect, const BPoint &pt) point_in(const clipping_rect &rect, const BPoint &pt)
{ {
if (pt.x >= rect.left && pt.x <= rect.right if (pt.x >= rect.left && pt.x <= rect.right
&& pt.y >= rect.top && pt.y <= rect.bottom) && pt.y >= rect.top && pt.y <= rect.bottom)
return true; return true;
return false; return false;
@ -173,7 +155,7 @@ rects_intersect(const clipping_rect &rectA, const clipping_rect &rectB)
if (!valid_rect(rectA) || !valid_rect(rectB)) if (!valid_rect(rectA) || !valid_rect(rectB))
return false; return false;
// TODO: Is there a better algorithm ? // TODO: Is there a better algorithm ?
// the one we used is faster than // the one we used is faster than
// ' return valid_rect(sect_rect(rectA, rectB)); ', though. // ' return valid_rect(sect_rect(rectA, rectB)); ', though.