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

Fixed an off-by-one bug which could've been triggered only in some particular (and probably very rare) circumstances, extended a TODO items, improved the readability of some code (hopefully).

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@12655 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stefano Ceccherini 2005-05-13 09:27:49 +00:00
parent f95eb77cef
commit ddbbb2e76d
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/kits/interface/RegionSupport.cpp
View File

@ -1,5 +1,5 @@
//------------------------------------------------------------------------------
// Copyright (c) 2003-2004, OpenBeOS
// Copyright (c) 2003-2005, Haiku, Inc.
//
// Permission is hereby granted, free of charge, to any person obtaining a
// copy of this software and associated documentation files (the "Software"),
@ -85,7 +85,7 @@ BRegion::Support::ClearRegion(BRegion *region)
{
CALLED();
// XXX: What is it used for ?
// TODO: What is it used for ?
// Could be that a cleared region represents an infinite one ?
region->count = 0;
@ -148,8 +148,8 @@ BRegion::Support::AndRegion(BRegion *first, BRegion *second, BRegion *dest)
dest->data[0] = intersection;
dest->bound = intersection;
dest->count = 1;
}
else if (first->count > 1 && second->count == 1)
} else if (first->count > 1 && second->count == 1)
AndRegion1ToN(second, first, dest);
else if (first->count == 1 && second->count > 1)
@ -715,15 +715,15 @@ BRegion::Support::OrRegionNoX(BRegion *first, BRegion *second, BRegion *dest)
long x;
if (first->count == 0)
if (first->count == 0) {
for (x = 0; x < second->count; x++)
dest->_AddRect(second->data[x]);
else if (second->count == 0)
} else if (second->count == 0) {
for (x = 0; x < first->count; x++)
dest->_AddRect(first->data[x]);
else {
} else {
long f = 0, s = 0;
while (f < first->count && s < second->count) {
@ -823,7 +823,8 @@ BRegion::Support::RSub(long top, long bottom, BRegion *first, BRegion *second, B
{
CALLED();
// TODO: review heap management
// TODO: This function is really messy, although it does its work
// well enough: try to cleanup, and review especially heap/stack management
int32 stackLeftsA[kMaxPoints / 2];
int32 stackLeftsB[kMaxPoints / 2];
int32 stackRightsA[kMaxPoints / 2];
@ -846,8 +847,10 @@ BRegion::Support::RSub(long top, long bottom, BRegion *first, BRegion *second, B
// allocate arrays on the heap, if the ones one the stack are too small
int32 *allocatedBuffer = NULL;
int32 maxCountA = first->count - i1;
int32 maxCountB = second->count - i2;
// The +1 is needed here, see InvertRectangles()
int32 maxCountA = first->count - i1 + 1;
int32 maxCountB = second->count - i2 + 1;
if (maxCountA + maxCountB > kMaxPoints) {
RTRACE(("Stack space isn't sufficient. Allocating %ld bytes on the heap...\n",