Stephan Bergmann
0c54c3f77a
...contrary to what c511c65434 "tdf#146619 Use
more forward declarations in include/tools" apparently assumed, as seen at least
with recent Clang 23 trunk against recent libstdc++ 16 trunk,
> In file included from tools/source/generic/poly2.cxx:22:
> In file included from tools/inc/poly.h:22:
> In file included from ~/gcc/inst/lib/gcc/x86_64-pc-linux-gnu/16.0.1/../../../../include/c++/16.0.1/memory:80:
> ~/gcc/inst/lib/gcc/x86_64-pc-linux-gnu/16.0.1/../../../../include/c++/16.0.1/bits/unique_ptr.h:131:18: error: invalid application of 'sizeof' to an incomplete type 'Point'
> 131 | static_assert(sizeof(_Tp)>0,
> | ^~~~~~~~~~~
> ~/gcc/inst/lib/gcc/x86_64-pc-linux-gnu/16.0.1/../../../../include/c++/16.0.1/bits/unique_ptr.h:684:4: note: in instantiation of function template specialization 'std::default_delete<Point[]>::operator()<Point>' requested here
> 684 | get_deleter()(__ptr);
> | ^
> tools/inc/poly.h:33:21: note: in instantiation of member function 'std::unique_ptr<Point[]>::~unique_ptr' requested here
> 33 | ImplPolygon() : mnPoints(0) {}
> | ^
> include/tools/poly.hxx:60:7: note: forward declaration of 'Point'
> 60 | class Point;
> | ^
Change-Id: I0b96222dcec7e98b974151004248a91ba1854e60
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/198573
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <stephan.bergmann@collabora.com>
98 lines
3.8 KiB
C++
98 lines
3.8 KiB
C++
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
|
|
/*
|
|
* This file is part of the LibreOffice project.
|
|
*
|
|
* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
|
*
|
|
* This file incorporates work covered by the following license notice:
|
|
*
|
|
* Licensed to the Apache Software Foundation (ASF) under one or more
|
|
* contributor license agreements. See the NOTICE file distributed
|
|
* with this work for additional information regarding copyright
|
|
* ownership. The ASF licenses this file to you under the Apache
|
|
* License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0 .
|
|
*/
|
|
#pragma once
|
|
|
|
#include <sal/types.h>
|
|
#include <memory>
|
|
#include <tools/gen.hxx>
|
|
#include <tools/poly.hxx>
|
|
|
|
class SAL_WARN_UNUSED ImplPolygon
|
|
{
|
|
public:
|
|
std::unique_ptr<Point[]> mxPointAry;
|
|
std::unique_ptr<PolyFlags[]> mxFlagAry;
|
|
sal_uInt16 mnPoints;
|
|
|
|
public:
|
|
ImplPolygon() : mnPoints(0) {}
|
|
ImplPolygon( sal_uInt16 nInitSize );
|
|
ImplPolygon( sal_uInt16 nPoints, const Point* pPtAry, const PolyFlags* pInitFlags );
|
|
ImplPolygon( const ImplPolygon& rImplPoly );
|
|
ImplPolygon( ImplPolygon&& rImplPoly ) noexcept;
|
|
ImplPolygon( const tools::Rectangle& rRect );
|
|
ImplPolygon( const tools::Rectangle& rRect, sal_uInt32 nHorzRound, sal_uInt32 nVertRound);
|
|
ImplPolygon( const Point& rCenter, tools::Long nRadX, tools::Long nRadY );
|
|
ImplPolygon( const tools::Rectangle& rBound, const Point& rStart, const Point& rEnd,
|
|
PolyStyle eStyle, bool bClockWiseArcDirection );
|
|
ImplPolygon( const Point& aCenter, const sal_uInt32 nRadius,
|
|
const float fStartAngle, const float fSweepAngle,
|
|
const bool bClockWiseArcDirection );
|
|
ImplPolygon( const Point& rBezPt1, const Point& rCtrlPt1, const Point& rBezPt2,
|
|
const Point& rCtrlPt2, sal_uInt16 nPoints );
|
|
ImplPolygon(const basegfx::B2DPolygon& rPolygon);
|
|
|
|
bool operator==( const ImplPolygon& rCandidate ) const;
|
|
|
|
void ImplInitSize(sal_uInt16 nInitSize, bool bFlags = false);
|
|
void ImplSetSize( sal_uInt16 nSize, bool bResize = true );
|
|
void ImplCreateFlagArray();
|
|
bool ImplSplit( sal_uInt16 nPos, sal_uInt16 nSpace, ImplPolygon const * pInitPoly = nullptr );
|
|
};
|
|
|
|
#define MAX_POLYGONS SAL_MAX_UINT16
|
|
|
|
struct ImplPolyPolygon
|
|
{
|
|
std::vector<tools::Polygon> mvPolyAry;
|
|
|
|
typedef std::vector<tools::Polygon>::iterator iterator;
|
|
typedef std::vector<tools::Polygon>::const_iterator const_iterator;
|
|
|
|
ImplPolyPolygon( sal_uInt16 nInitSize )
|
|
{
|
|
if ( !nInitSize )
|
|
nInitSize = 1;
|
|
mvPolyAry.reserve(nInitSize);
|
|
}
|
|
|
|
ImplPolyPolygon( const tools::Polygon& rPoly )
|
|
{
|
|
if ( rPoly.GetSize() )
|
|
mvPolyAry.push_back(rPoly);
|
|
else
|
|
mvPolyAry.reserve(16);
|
|
}
|
|
|
|
ImplPolyPolygon(const basegfx::B2DPolyPolygon& rPolyPolygon);
|
|
|
|
bool operator==(ImplPolyPolygon const & other) const
|
|
{
|
|
return mvPolyAry == other.mvPolyAry;
|
|
}
|
|
|
|
iterator begin() { return mvPolyAry.begin(); }
|
|
iterator end() { return mvPolyAry.end(); }
|
|
|
|
const_iterator begin() const { return mvPolyAry.begin(); }
|
|
const_iterator end() const { return mvPolyAry.end(); }
|
|
};
|
|
|
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|