i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Applied patch by Vasilis Kaoutsis:

Browse Source 
* replaced new[] with malloc()/realloc() where appropriate - since we're messing with
  the bits anyway, this makes the code slightly faster.
* however, we might want to throw some std::bad_alloc exceptions to deal correctly with
  low memory situations.
* cleanup.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@20065 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2007-02-04 13:32:36 +00:00
parent ac5beb17a5
commit 815c38625d
3 changed files with 209 additions and 270 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headers/os/interface/Polygon.h
+41 -80
View File
@@ -1,84 +1,45 @@
//------------------------------------------------------------------------------ /*
// Copyright (c) 2001-2002, OpenBeOS * Copyright 2001-2007, 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 * Marc Flerackers, [email protected]
// 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: Polygon.h
// Author: Marc Flerackers ([email protected])
// Description: BPolygon represents a n-sided area.
//------------------------------------------------------------------------------
#ifndef _POLYGON_H #ifndef _POLYGON_H
#define _POLYGON_H #define _POLYGON_H
// Standard Includes -----------------------------------------------------------
// System Includes -------------------------------------------------------------
#include <BeBuild.h>
#include <InterfaceDefs.h>
#include <Rect.h>
// Project Includes ------------------------------------------------------------
// Local Includes --------------------------------------------------------------
// Local Defines ---------------------------------------------------------------
// Globals ---------------------------------------------------------------------
// BPolygon class --------------------------------------------------------------
class BPolygon {
public:
BPolygon(const BPoint *ptArray, int32 numPoints); #include <BeBuild.h>
BPolygon(); #include <InterfaceDefs.h>
BPolygon(const BPolygon *poly); #include <Rect.h>
virtual ~BPolygon();
BPolygon &operator=(const BPolygon &from); class BPolygon {
public:
BRect Frame() const; BPolygon(const BPoint *ptArray, int32 numPoints);
void AddPoints(const BPoint *ptArray, int32 numPoints); BPolygon(const BPolygon *polygon);
int32 CountPoints() const; BPolygon();
void MapTo(BRect srcRect, BRect dstRect); virtual ~BPolygon();
void PrintToStream() const;
BPolygon &operator=(const BPolygon &from);
private:
BRect Frame() const;
friend class BView; void AddPoints(const BPoint *ptArray, int32 numPoints);
int32 CountPoints() const;
void compute_bounds(); void MapTo(BRect srcRect, BRect dstRect);
void map_pt(BPoint *point, BRect srcRect, BRect dstRect); void PrintToStream() const;
void map_rect(BRect *rect, BRect srcRect, BRect dstRect);
private:
BRect fBounds; friend class BView;
int32 fCount;
BPoint *fPts; void _ComputeBounds();
void _MapPoint(BPoint *point, BRect srcRect, BRect dstRect);
void _MapRectangle(BRect *rect, BRect srcRect, BRect dstRect);
private:
BRect fBounds;
int32 fCount;
BPoint *fPoints;
}; };
//------------------------------------------------------------------------------
#endif // _POLYGON_H_ #endif // _POLYGON_H_
/*
* $Log $
*
* $Id $
*
*/
src/kits/interface/Polygon.cpp
+164 -186
View File
@@ -1,186 +1,164 @@
//------------------------------------------------------------------------------ /*
// Copyright (c) 2001-2002, OpenBeOS * Copyright 2001-2007, 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 * Marc Flerackers, [email protected]
// 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:
// #include <Polygon.h>
// The above copyright notice and this permission notice shall be included in
// all copies or substantial portions of the Software. #include <stdlib.h>
// #include <string.h>
// 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 BPolygon::BPolygon(const BPoint *ptArray, int32 numPoints)
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER :
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING fBounds(0.0, 0.0, 0.0, 0.0),
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER fCount(numPoints),
// DEALINGS IN THE SOFTWARE. fPoints(NULL)
// {
// File Name: Polygon.h if (fCount > 0) {
// Author: Marc Flerackers ([email protected]) fPoints = (BPoint*)malloc(numPoints * sizeof(BPoint));
// Description: BPolygon represents a n-sided area.
//------------------------------------------------------------------------------ // Note the use of memcpy here. The assumption is that an array of BPoints can
// be copied bit by bit and not use a copy constructor or an assignment
// Standard Includes ----------------------------------------------------------- // operator. This breaks the containment of BPoint but will result in better
#include <string.h> // performance. An example where the memcpy will fail would be if BPoint begins
// to do lazy copying through reference counting. By copying the bits, we will
// System Includes ------------------------------------------------------------- // copy reference counting state which will not be relevant at the destination.
#include <Polygon.h> // Luckily, BPoint is a very simple class which isn't likely to change much.
//
// Project Includes ------------------------------------------------------------ // Similar use of memcpy appears later in this implementation also.
// Local Includes -------------------------------------------------------------- memcpy(fPoints, ptArray, numPoints * sizeof(BPoint));
_ComputeBounds();
// Local Defines --------------------------------------------------------------- }
}
// Globals ---------------------------------------------------------------------
//------------------------------------------------------------------------------ BPolygon::BPolygon(const BPolygon *poly)
BPolygon::BPolygon(const BPoint *ptArray, int32 numPoints) : {
fBounds(0.0, 0.0, 0.0, 0.0), fCount(numPoints), fPts(NULL) *this = *poly;
{ }
if (fCount > 0) {
fPts = new BPoint[numPoints];
BPolygon::BPolygon()
// Note the use of memcpy here. The assumption is that an array of BPoints can :
// be copied bit by bit and not use a copy constructor or an assignment fBounds(0.0, 0.0, 0.0, 0.0),
// operator. This breaks the containment of BPoint but will result in better fCount(0),
// performance. An example where the memcpy will fail would be if BPoint begins fPoints(NULL)
// to do lazy copying through reference counting. By copying the bits, we will {
// copy reference counting state which will not be relevant at the destination. }
// Luckily, BPoint is a very simple class which isn't likely to change much.
// However, it is a risk of this implementation.
// BPolygon::~BPolygon()
// If necessary, this code can be changed to iterate over the input array of {
// BPoints and use the assignment operator to copy from the source to the free(fPoints);
// destination array, one element at a time. }
//
// Similar use of memcpy appears later in this implementation also.
// BPolygon &
memcpy(fPts, ptArray, numPoints * sizeof(BPoint)); BPolygon::operator=(const BPolygon &from)
compute_bounds(); {
} // Make sure we aren't trying to perform a "self assignment".
} if (this != &from) {
//------------------------------------------------------------------------------ fBounds = from.fBounds;
BPolygon::BPolygon(const BPolygon *poly) fCount = from.fCount;
{ if (fCount > 0) {
*this = *poly; fPoints = (BPoint*)malloc(fCount * sizeof(BPoint));
} memcpy(fPoints, from.fPoints, fCount * sizeof(BPoint));
//------------------------------------------------------------------------------ }
BPolygon::BPolygon () }
: fBounds(0.0, 0.0, 0.0, 0.0), return *this;
fCount(0), }
fPts(NULL)
{
} BRect
//------------------------------------------------------------------------------ BPolygon::Frame() const
BPolygon::~BPolygon () {
{ return fBounds;
if (fPts) }
delete[] fPts;
}
//------------------------------------------------------------------------------ void
BPolygon &BPolygon::operator=(const BPolygon &from) BPolygon::AddPoints(const BPoint *ptArray, int32 numPoints)
{ {
// Make sure we aren't trying to perform a "self assignment". if (numPoints > 0) {
if (this != &from) { fPoints = (BPoint*)realloc(fPoints, (fCount + numPoints) * sizeof(BPoint));
fBounds = from.fBounds; memcpy(fPoints + fCount + numPoints, ptArray, numPoints * sizeof(BPoint));
fCount = from.fCount; fCount += numPoints;
if (fCount > 0) { _ComputeBounds();
fPts = new BPoint[fCount]; }
memcpy(fPts, from.fPts, fCount * sizeof(BPoint)); }
}
}
return *this; int32
} BPolygon::CountPoints() const
//------------------------------------------------------------------------------ {
BRect BPolygon::Frame() const return fCount;
{ }
return fBounds;
}
//------------------------------------------------------------------------------ void
void BPolygon::AddPoints(const BPoint *ptArray, int32 numPoints) BPolygon::MapTo(BRect srcRect, BRect dstRect)
{ {
if (numPoints > 0) { for (int32 i = 0; i < fCount; i++)
BPoint *newPts = new BPoint[fCount + numPoints]; _MapPoint(fPoints + i, srcRect, dstRect);
if (fPts) { _MapRectangle(&fBounds, srcRect, dstRect);
memcpy(newPts, fPts, fCount * sizeof(BPoint)); }
delete fPts;
}
memcpy(newPts + fCount, ptArray, numPoints * sizeof(BPoint)); void
fPts = newPts; BPolygon::PrintToStream () const
fCount += numPoints; {
compute_bounds(); for (int32 i = 0; i < fCount; i++)
} fPoints[i].PrintToStream();
} }
//------------------------------------------------------------------------------
int32 BPolygon::CountPoints() const
{ void
return fCount; BPolygon::_ComputeBounds()
} {
//------------------------------------------------------------------------------ if (fCount == 0) {
void BPolygon::MapTo(BRect srcRect, BRect dstRect) fBounds = BRect(0.0, 0.0, 0.0, 0.0);
{ return;
for (int32 i = 0; i < fCount; i++) }
map_pt(fPts + i, srcRect, dstRect);
map_rect(&fBounds, srcRect, dstRect); fBounds = BRect(fPoints[0], fPoints[0]);
}
//------------------------------------------------------------------------------ for (int32 i = 1; i < fCount; i++) {
void BPolygon::PrintToStream () const if (fPoints[i].x < fBounds.left)
{ fBounds.left = fPoints[i].x;
for (int32 i = 0; i < fCount; i++) if (fPoints[i].y < fBounds.top)
fPts[i].PrintToStream(); fBounds.top = fPoints[i].y;
} if (fPoints[i].x > fBounds.right)
//------------------------------------------------------------------------------ fBounds.right = fPoints[i].x;
void BPolygon::compute_bounds() if (fPoints[i].y > fBounds.bottom)
{ fBounds.bottom = fPoints[i].y;
if (fCount == 0) { }
fBounds = BRect(0.0, 0.0, 0.0, 0.0); }
return;
}
void
fBounds = BRect(fPts[0], fPts[0]); BPolygon::_MapPoint(BPoint *point, BRect srcRect, BRect dstRect)
{
for (int32 i = 1; i < fCount; i++) point->x = (point->x - srcRect.left) * dstRect.Width() / srcRect.Width()
{ + dstRect.left;
if (fPts[i].x < fBounds.left) point->y = (point->y - srcRect.top) * dstRect.Height() / srcRect.Height()
fBounds.left = fPts[i].x; + dstRect.top;
if (fPts[i].y < fBounds.top) }
fBounds.top = fPts[i].y;
if (fPts[i].x > fBounds.right)
fBounds.right = fPts[i].x; void
if (fPts[i].y > fBounds.bottom) BPolygon::_MapRectangle(BRect *rect, BRect srcRect, BRect dstRect)
fBounds.bottom = fPts[i].y; {
} BPoint leftTop = rect->LeftTop();
} BPoint bottomRight = rect->RightBottom();
//------------------------------------------------------------------------------
void BPolygon::map_pt(BPoint *point, BRect srcRect, BRect dstRect) _MapPoint(&leftTop, srcRect, dstRect);
{ _MapPoint(&bottomRight, srcRect, dstRect);
point->x = (point->x - srcRect.left) * dstRect.Width() / srcRect.Width()
+ dstRect.left; *rect = BRect(leftTop, bottomRight);
point->y = (point->y - srcRect.top) * dstRect.Height() / srcRect.Height() }
+ dstRect.top;
}
//------------------------------------------------------------------------------
void BPolygon::map_rect(BRect *rect, BRect srcRect, BRect dstRect)
{
BPoint leftTop = rect->LeftTop();
BPoint bottomRight = rect->RightBottom();
map_pt(&leftTop, srcRect, dstRect);
map_pt(&bottomRight, srcRect, dstRect);
*rect = BRect(leftTop, bottomRight);
}
//------------------------------------------------------------------------------
/*
* $Log $
*
* $Id $
*
*/
src/kits/interface/View.cpp
+4 -4
View File
@@ -2583,7 +2583,7 @@ BView::StrokePolygon(const BPolygon *polygon, bool closed, pattern p)
if (!polygon) if (!polygon)
return; return;
StrokePolygon(polygon->fPts, polygon->fCount, polygon->Frame(), closed, p); StrokePolygon(polygon->fPoints, polygon->fCount, polygon->Frame(), closed, p);
} }
@@ -2592,7 +2592,7 @@ BView::StrokePolygon(const BPoint *ptArray, int32 numPoints, bool closed, patter
{ {
BPolygon polygon(ptArray, numPoints); BPolygon polygon(ptArray, numPoints);
StrokePolygon(polygon.fPts, polygon.fCount, polygon.Frame(), closed, p); StrokePolygon(polygon.fPoints, polygon.fCount, polygon.Frame(), closed, p);
} }
@@ -2617,7 +2617,7 @@ BView::StrokePolygon(const BPoint *ptArray, int32 numPoints, BRect bounds,
fOwner->fLink->Attach<BRect>(polygon.Frame()); fOwner->fLink->Attach<BRect>(polygon.Frame());
fOwner->fLink->Attach<bool>(closed); fOwner->fLink->Attach<bool>(closed);
fOwner->fLink->Attach<int32>(polygon.fCount); fOwner->fLink->Attach<int32>(polygon.fCount);
fOwner->fLink->Attach(polygon.fPts, polygon.fCount * sizeof(BPoint)); fOwner->fLink->Attach(polygon.fPoints, polygon.fCount * sizeof(BPoint));
_FlushIfNotInTransaction(); _FlushIfNotInTransaction();
} else { } else {
@@ -2642,7 +2642,7 @@ BView::FillPolygon(const BPolygon *polygon, ::pattern pattern)
polygon->fCount * sizeof(BPoint) + sizeof(BRect) + sizeof(int32)) == B_OK) { polygon->fCount * sizeof(BPoint) + sizeof(BRect) + sizeof(int32)) == B_OK) {
fOwner->fLink->Attach<BRect>(polygon->Frame()); fOwner->fLink->Attach<BRect>(polygon->Frame());
fOwner->fLink->Attach<int32>(polygon->fCount); fOwner->fLink->Attach<int32>(polygon->fCount);
fOwner->fLink->Attach(polygon->fPts, polygon->fCount * sizeof(BPoint)); fOwner->fLink->Attach(polygon->fPoints, polygon->fCount * sizeof(BPoint));
_FlushIfNotInTransaction(); _FlushIfNotInTransaction();
} else { } else {