diff options
Diffstat (limited to 'basegfx/source/polygon/b3dpolypolygontools.cxx')
| -rw-r--r-- | basegfx/source/polygon/b3dpolypolygontools.cxx | 66 |
1 files changed, 27 insertions, 39 deletions
diff --git a/basegfx/source/polygon/b3dpolypolygontools.cxx b/basegfx/source/polygon/b3dpolypolygontools.cxx index 394c093c5e5f..660d43288ae2 100644 --- a/basegfx/source/polygon/b3dpolypolygontools.cxx +++ b/basegfx/source/polygon/b3dpolypolygontools.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * 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/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * 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 . + */ #include <basegfx/polygon/b3dpolypolygontools.hxx> #include <basegfx/range/b3drange.hxx> @@ -37,6 +28,11 @@ #include <osl/mutex.hxx> ////////////////////////////////////////////////////////////////////////////// +// predefines +#define nMinSegments sal_uInt32(1) +#define nMaxSegments sal_uInt32(512) + +////////////////////////////////////////////////////////////////////////////// namespace basegfx { @@ -235,20 +231,16 @@ namespace basegfx nHorSeg = fround(fabs(fHorStop - fHorStart) / (F_2PI / 24.0)); } - if(!nHorSeg) - { - nHorSeg = 1L; - } + // min/max limitations + nHorSeg = ::std::min(nMaxSegments, ::std::max(nMinSegments, nHorSeg)); if(!nVerSeg) { nVerSeg = fround(fabs(fVerStop - fVerStart) / (F_2PI / 24.0)); } - if(!nVerSeg) - { - nVerSeg = 1L; - } + // min/max limitations + nVerSeg = ::std::min(nMaxSegments, ::std::max(nMinSegments, nVerSeg)); // create constants const double fVerDiffPerStep((fVerStop - fVerStart) / (double)nVerSeg); @@ -338,20 +330,16 @@ namespace basegfx nHorSeg = fround(fabs(fHorStop - fHorStart) / (F_2PI / 24.0)); } - if(!nHorSeg) - { - nHorSeg = 1L; - } + // min/max limitations + nHorSeg = ::std::min(nMaxSegments, ::std::max(nMinSegments, nHorSeg)); if(!nVerSeg) { nVerSeg = fround(fabs(fVerStop - fVerStart) / (F_2PI / 24.0)); } - if(!nVerSeg) - { - nVerSeg = 1L; - } + // min/max limitations + nVerSeg = ::std::min(nMaxSegments, ::std::max(nMinSegments, nVerSeg)); // vertical loop for(sal_uInt32 a(0L); a < nVerSeg; a++) |