diff options
Diffstat (limited to 'chart2/source')
| -rw-r--r-- | chart2/source/tools/OPropertySet.cxx | 6 | ||||
| -rw-r--r-- | chart2/source/view/charttypes/Splines.cxx | 12 | ||||
| -rw-r--r-- | chart2/source/view/main/GL3DRenderer.cxx | 4 |
3 files changed, 11 insertions, 11 deletions
diff --git a/chart2/source/tools/OPropertySet.cxx b/chart2/source/tools/OPropertySet.cxx index c54537f5a9ea..939741c4f210 100644 --- a/chart2/source/tools/OPropertySet.cxx +++ b/chart2/source/tools/OPropertySet.cxx @@ -25,7 +25,7 @@ #include <vector> #include <algorithm> -#include <boost/scoped_array.hpp> +#include <memory> using namespace ::com::sun::star; @@ -143,7 +143,7 @@ Sequence< beans::PropertyState > SAL_CALL { cppu::IPropertyArrayHelper & rPH = getInfoHelper(); - boost::scoped_array<sal_Int32> pHandles(new sal_Int32[ aPropertyName.getLength() ]); + std::unique_ptr<sal_Int32[]> pHandles(new sal_Int32[ aPropertyName.getLength() ]); rPH.fillHandles( pHandles.get(), aPropertyName ); ::std::vector< sal_Int32 > aHandles( pHandles.get(), pHandles.get() + aPropertyName.getLength()); @@ -194,7 +194,7 @@ void SAL_CALL { cppu::IPropertyArrayHelper & rPH = getInfoHelper(); - boost::scoped_array<sal_Int32> pHandles(new sal_Int32[ aPropertyNames.getLength() ]); + std::unique_ptr<sal_Int32[]> pHandles(new sal_Int32[ aPropertyNames.getLength() ]); rPH.fillHandles( pHandles.get(), aPropertyNames ); ::std::vector< sal_Int32 > aHandles( pHandles.get(), pHandles.get() + aPropertyNames.getLength()); diff --git a/chart2/source/view/charttypes/Splines.cxx b/chart2/source/view/charttypes/Splines.cxx index 660c8ce01f7a..c57acb649601 100644 --- a/chart2/source/view/charttypes/Splines.cxx +++ b/chart2/source/view/charttypes/Splines.cxx @@ -24,7 +24,7 @@ #include <vector> #include <algorithm> #include <functional> -#include <boost/scoped_array.hpp> +#include <memory> #define MAX_BSPLINE_DEGREE 15 @@ -721,14 +721,14 @@ void SplineCalculater::CalculateBSplines( continue; // need at least 2 points, degree p needs at least n+1 points // next piece of series - boost::scoped_array<double> t(new double [n+1]); + std::unique_ptr<double[]> t(new double [n+1]); if (!createParameterT(aPointsIn, t.get())) { continue; // next piece of series } lcl_tSizeType m = n + p + 1; - boost::scoped_array<double> u(new double [m+1]); + std::unique_ptr<double[]> u(new double [m+1]); createKnotVector(n, p, t.get(), u.get()); // The matrix N contains the B-spline basis functions applied to parameters. @@ -736,14 +736,14 @@ void SplineCalculater::CalculateBSplines( // column in a higher row is equal or greater than in the lower row. // To store this matrix the non-zero elements are shifted to column 0 // and the amount of shifting is remembered in an array. - boost::scoped_array<double*> aMatN(new double*[n+1]); + std::unique_ptr<double*[]> aMatN(new double*[n+1]); for (lcl_tSizeType row = 0; row <=n; ++row) { aMatN[row] = new double[p+1]; for (sal_uInt32 col = 0; col <= p; ++col) aMatN[row][col] = 0.0; } - boost::scoped_array<lcl_tSizeType> aShift(new lcl_tSizeType[n+1]); + std::unique_ptr<lcl_tSizeType[]> aShift(new lcl_tSizeType[n+1]); aMatN[0][0] = 1.0; //all others are zero aShift[0] = 0; aMatN[n][0] = 1.0; @@ -879,7 +879,7 @@ void SplineCalculater::CalculateBSplines( pNewX[nNewSize -1 ] = aPointsIn[n].first; pNewY[nNewSize -1 ] = aPointsIn[n].second; pNewZ[nNewSize -1 ] = fZCoordinate; - boost::scoped_array<double> aP(new double[m+1]); + std::unique_ptr<double[]> aP(new double[m+1]); lcl_tSizeType nLow = 0; for ( lcl_tSizeType nTIndex = 0; nTIndex <= n-1; ++nTIndex) { diff --git a/chart2/source/view/main/GL3DRenderer.cxx b/chart2/source/view/main/GL3DRenderer.cxx index ee3dbb59b93c..4d10e4f8b4d2 100644 --- a/chart2/source/view/main/GL3DRenderer.cxx +++ b/chart2/source/view/main/GL3DRenderer.cxx @@ -20,7 +20,7 @@ #include <StaticGeometry.h> #include "glm/gtc/matrix_inverse.hpp" #include <boost/checked_delete.hpp> -#include <boost/scoped_array.hpp> +#include <memory> #define DEBUG_FBO 0 @@ -2257,7 +2257,7 @@ sal_uInt32 OpenGL3DRenderer::GetPixelColorFromPoint(long nX, long nY) static sal_uInt32 nId = 0; OUString aFileName = "/home/moggi/work/picking_" + OUString::number(nId++) + ".png"; OpenGLHelper::renderToFile(m_iWidth, m_iHeight, aFileName); - boost::scoped_array<sal_uInt8> buf(new sal_uInt8[4]); + std::unique_ptr<sal_uInt8[]> buf(new sal_uInt8[4]); glReadPixels(nX, m_iHeight-nY, 1, 1, GL_BGRA, GL_UNSIGNED_BYTE, buf.get()); Color aColor(255-buf[3], buf[2], buf[1], buf[0]); return aColor.GetColor(); |