rtl/string.hxx and rtl/ustring.hxx both unnecessarily #include <sal/log.hxx> (and don't make use of it themselves), but many other files happen to depend on it.
This is a continuation of commit 6ff2d84ade
to be able to remove those unneeded includes.
This commit adds missing headers to every file found by:
grep -FwL sal/log.hxx $(git grep -Elw 'SAL_INFO|SAL_INFO_IF|SAL_WARN|SAL_WARN_IF|SAL_DETAIL_LOG_STREAM|SAL_WHERE|SAL_STREAM|SAL_DEBUG')
to directories from dbaccess to extensions
Change-Id: I4d15aa35e11664ef78c836ffc2937c7e0bb6ea59
Reviewed-on: https://gerrit.libreoffice.org/58165
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
192 lines
6.7 KiB
C++
192 lines
6.7 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 .
|
|
*/
|
|
|
|
#include <basegfx/point/b2dpoint.hxx>
|
|
#include <basegfx/polygon/b2dpolygon.hxx>
|
|
#include <basegfx/polygon/b2dpolypolygon.hxx>
|
|
#include <sal/log.hxx>
|
|
#include "emfppath.hxx"
|
|
|
|
namespace emfplushelper
|
|
{
|
|
EMFPPath::EMFPPath (sal_Int32 _nPoints, bool bLines)
|
|
{
|
|
if (_nPoints<0 || sal_uInt32(_nPoints)>SAL_MAX_INT32 / (2 * sizeof(float)))
|
|
{
|
|
_nPoints = SAL_MAX_INT32 / (2 * sizeof(float));
|
|
}
|
|
|
|
nPoints = _nPoints;
|
|
pPoints.reset( new float [nPoints*2] );
|
|
|
|
if (!bLines)
|
|
pPointTypes.reset( new sal_uInt8 [_nPoints] );
|
|
}
|
|
|
|
EMFPPath::~EMFPPath ()
|
|
{
|
|
}
|
|
|
|
void EMFPPath::Read (SvStream& s, sal_uInt32 pathFlags)
|
|
{
|
|
for (int i = 0; i < nPoints; i ++)
|
|
{
|
|
if (pathFlags & 0x800)
|
|
{
|
|
// EMFPlusPointR: points are stored in EMFPlusInteger7 or
|
|
// EMFPlusInteger15 objects, see section 2.2.2.21/22
|
|
// If 0x800 bit is set, the 0x4000 bit is undefined and must be ignored
|
|
SAL_WARN("drawinglayer", "EMF+\t\t TODO - parse EMFPlusPointR object (section 2.2.1.6)");
|
|
}
|
|
else if (pathFlags & 0x4000)
|
|
{
|
|
// EMFPlusPoint: stored in signed short 16bit integer format
|
|
sal_Int16 x, y;
|
|
|
|
s.ReadInt16( x ).ReadInt16( y );
|
|
SAL_INFO ("drawinglayer", "EMF+\t EMFPlusPoint [x,y]: " << x << "," << y);
|
|
pPoints [i*2] = x;
|
|
pPoints [i*2 + 1] = y;
|
|
}
|
|
else
|
|
{
|
|
// EMFPlusPointF: stored in Single (float) format
|
|
s.ReadFloat( pPoints [i*2] ).ReadFloat( pPoints [i*2 + 1] );
|
|
SAL_INFO ("drawinglayer", "EMF+\t EMFPlusPointF [x,y]: " << pPoints [i*2] << "," << pPoints [i*2 + 1]);
|
|
}
|
|
}
|
|
|
|
if (pPointTypes)
|
|
{
|
|
for (int i = 0; i < nPoints; i++)
|
|
{
|
|
s.ReadUChar(pPointTypes[i]);
|
|
SAL_INFO("drawinglayer", "EMF+\tpoint type: " << static_cast<int>(pPointTypes[i]));
|
|
}
|
|
}
|
|
|
|
aPolygon.clear();
|
|
}
|
|
|
|
::basegfx::B2DPolyPolygon& EMFPPath::GetPolygon (EmfPlusHelperData const & rR, bool bMapIt, bool bAddLineToCloseShape)
|
|
{
|
|
::basegfx::B2DPolygon polygon;
|
|
aPolygon.clear ();
|
|
int last_normal = 0, p = 0;
|
|
::basegfx::B2DPoint prev, mapped;
|
|
bool hasPrev = false;
|
|
|
|
for (int i = 0; i < nPoints; i ++)
|
|
{
|
|
if (p && pPointTypes && (pPointTypes [i] == 0))
|
|
{
|
|
aPolygon.append (polygon);
|
|
last_normal = i;
|
|
p = 0;
|
|
polygon.clear ();
|
|
}
|
|
|
|
if (bMapIt)
|
|
mapped = rR.Map (pPoints [i*2], pPoints [i*2 + 1]);
|
|
else
|
|
mapped = ::basegfx::B2DPoint (pPoints [i*2], pPoints [i*2 + 1]);
|
|
|
|
if (pPointTypes)
|
|
{
|
|
if ((pPointTypes [i] & 0x07) == 3)
|
|
{
|
|
if (((i - last_normal )% 3) == 1)
|
|
{
|
|
polygon.setNextControlPoint (p - 1, mapped);
|
|
SAL_INFO ("drawinglayer", "polygon append next: " << p - 1 << " mapped: " << mapped.getX () << "," << mapped.getY ());
|
|
continue;
|
|
}
|
|
else if (((i - last_normal) % 3) == 2)
|
|
{
|
|
prev = mapped;
|
|
hasPrev = true;
|
|
continue;
|
|
}
|
|
}
|
|
else
|
|
{
|
|
last_normal = i;
|
|
}
|
|
}
|
|
|
|
polygon.append (mapped);
|
|
SAL_INFO ("drawinglayer", "polygon append point: " << pPoints [i*2] << "," << pPoints [i*2 + 1] << " mapped: " << mapped.getX () << ":" << mapped.getY ());
|
|
|
|
if (hasPrev)
|
|
{
|
|
polygon.setPrevControlPoint (p, prev);
|
|
SAL_INFO ("drawinglayer", "polygon append prev: " << p << " mapped: " << prev.getX () << "," << prev.getY ());
|
|
hasPrev = false;
|
|
}
|
|
|
|
p ++;
|
|
|
|
if (pPointTypes && (pPointTypes [i] & 0x80))
|
|
{
|
|
// closed polygon
|
|
polygon.setClosed (true);
|
|
aPolygon.append (polygon);
|
|
SAL_INFO ("drawinglayer", "close polygon");
|
|
last_normal = i + 1;
|
|
p = 0;
|
|
polygon.clear ();
|
|
}
|
|
}
|
|
|
|
// Draw an extra line between the last point and the first point, to close the shape.
|
|
if (bAddLineToCloseShape)
|
|
{
|
|
polygon.setClosed (true);
|
|
}
|
|
|
|
if (polygon.count ())
|
|
{
|
|
aPolygon.append (polygon);
|
|
|
|
#if OSL_DEBUG_LEVEL > 1
|
|
for (unsigned int i=0; i<aPolygon.count(); i++) {
|
|
polygon = aPolygon.getB2DPolygon(i);
|
|
SAL_INFO ("drawinglayer", "polygon: " << i);
|
|
for (unsigned int j=0; j<polygon.count(); j++) {
|
|
::basegfx::B2DPoint point = polygon.getB2DPoint(j);
|
|
SAL_INFO ("drawinglayer", "point: " << point.getX() << "," << point.getY());
|
|
if (polygon.isPrevControlPointUsed(j)) {
|
|
point = polygon.getPrevControlPoint(j);
|
|
SAL_INFO ("drawinglayer", "prev: " << point.getX() << "," << point.getY());
|
|
}
|
|
if (polygon.isNextControlPointUsed(j)) {
|
|
point = polygon.getNextControlPoint(j);
|
|
SAL_INFO ("drawinglayer", "next: " << point.getX() << "," << point.getY());
|
|
}
|
|
}
|
|
}
|
|
#endif
|
|
}
|
|
|
|
return aPolygon;
|
|
}
|
|
}
|
|
|
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|