loplugin:mergeclasses merge BPixelRaster into BZPixelRaster

Change-Id: Ib6f7bfd2392daa5512d5fa68b69428ae9c8876f9
Reviewed-on: https://gerrit.libreoffice.org/57488
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

drawinglayer/source/primitive2d/sceneprimitive2d.cxx

@@ -40,7 +40,7 @@ using namespace com::sun::star;
 
 namespace
 {
-    BitmapEx BPixelRasterToBitmapEx(const basegfx::BPixelRaster& rRaster, sal_uInt16 mnAntiAlialize)
+    BitmapEx BPixelRasterToBitmapEx(const basegfx::BZPixelRaster& rRaster, sal_uInt16 mnAntiAlialize)
     {
         BitmapEx aRetval;
         const sal_uInt32 nWidth(mnAntiAlialize ? rRaster.getWidth()/mnAntiAlialize : rRaster.getWidth());

drawinglayer/source/processor3d/zbufferprocessor3d.cxx

@@ -18,7 +18,7 @@
  */
 
 #include <drawinglayer/processor3d/zbufferprocessor3d.hxx>
-#include <basegfx/raster/bpixelraster.hxx>
+#include <basegfx/raster/bzpixelraster.hxx>
 #include <basegfx/raster/rasterconvert3d.hxx>
 #include <basegfx/raster/bzpixelraster.hxx>
 #include <drawinglayer/attribute/materialattribute3d.hxx>

include/basegfx/raster/bpixelraster.hxx

-/* -*- 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 .
- */
-
-#ifndef INCLUDED_BASEGFX_RASTER_BPIXELRASTER_HXX
-#define INCLUDED_BASEGFX_RASTER_BPIXELRASTER_HXX
-
-#include <memory>
-#include <algorithm>
-#include <string.h>
-#include <sal/types.h>
-#include <basegfx/pixel/bpixel.hxx>
-#include <basegfx/basegfxdllapi.h>
-
-namespace basegfx
-{
-    class BPixelRaster
-    {
-    private:
-        BPixelRaster(const BPixelRaster&) = delete;
-        BPixelRaster& operator=(const BPixelRaster&) = delete;
-
-    protected:
-        sal_uInt32                  mnWidth;
-        sal_uInt32                  mnHeight;
-        sal_uInt32                  mnCount;
-        std::unique_ptr<BPixel[]>   mpContent;
-
-    public:
-        // constructor/destructor
-        BPixelRaster(sal_uInt32 nWidth, sal_uInt32 nHeight)
-        :   mnWidth(nWidth),
-            mnHeight(nHeight),
-            mnCount(nWidth * nHeight),
-            mpContent(new BPixel[mnCount])
-        {}
-
-        // coordinate calcs between X/Y and span
-        sal_uInt32 getIndexFromXY(sal_uInt32 nX, sal_uInt32 nY) const { return (nX + (nY * mnWidth)); }
-
-        // data access read
-        sal_uInt32 getWidth() const { return mnWidth; }
-        sal_uInt32 getHeight() const { return mnHeight; }
-
-        // data access read only
-        const BPixel& getBPixel(sal_uInt32 nIndex) const
-        {
-            assert(nIndex < mnCount && "Access out of range");
-            return mpContent[nIndex];
-        }
-
-        // data access read/write
-        BPixel& getBPixel(sal_uInt32 nIndex)
-        {
-            assert(nIndex < mnCount && "Access out of range");
-            return mpContent[nIndex];
-        }
-    };
-} // end of namespace basegfx
-
-#endif // INCLUDED_BASEGFX_RASTER_BPIXELRASTER_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

include/basegfx/raster/bzpixelraster.hxx

@@ -20,51 +20,73 @@
 #ifndef INCLUDED_BASEGFX_RASTER_BZPIXELRASTER_HXX
 #define INCLUDED_BASEGFX_RASTER_BZPIXELRASTER_HXX
 
-#include <memory>
-#include <basegfx/raster/bpixelraster.hxx>
 #include <basegfx/basegfxdllapi.h>
+#include <basegfx/pixel/bpixel.hxx>
+#include <basegfx/raster/bzpixelraster.hxx>
 #include <osl/diagnose.h>
+#include <sal/types.h>
+#include <memory>
+#include <algorithm>
+#include <string.h>
 
 namespace basegfx
 {
-    class BZPixelRaster : public BPixelRaster
+    class BZPixelRaster
     {
+    private:
+        BZPixelRaster(const BZPixelRaster&) = delete;
+        BZPixelRaster& operator=(const BZPixelRaster&) = delete;
     protected:
-        // additionally, host a ZBuffer
+        sal_uInt32                  mnWidth;
+        sal_uInt32                  mnHeight;
+        sal_uInt32                  mnCount;
+        std::unique_ptr<BPixel[]>   mpContent;
         std::unique_ptr<sal_uInt16[]>  mpZBuffer;
 
     public:
         // constructor/destructor
         BZPixelRaster(sal_uInt32 nWidth, sal_uInt32 nHeight)
-        :   BPixelRaster(nWidth, nHeight),
+        :   mnWidth(nWidth),
+            mnHeight(nHeight),
+            mnCount(nWidth * nHeight),
+            mpContent(new BPixel[mnCount]),
             mpZBuffer(new sal_uInt16[mnCount])
         {
             memset(mpZBuffer.get(), 0, sizeof(sal_uInt16) * mnCount);
         }
 
+         // coordinate calcs between X/Y and span
+        sal_uInt32 getIndexFromXY(sal_uInt32 nX, sal_uInt32 nY) const { return (nX + (nY * mnWidth)); }
+
+        // data access read
+        sal_uInt32 getWidth() const { return mnWidth; }
+        sal_uInt32 getHeight() const { return mnHeight; }
+
          // data access read only
-        const sal_uInt16& getZ(sal_uInt32 nIndex) const
+        const BPixel& getBPixel(sal_uInt32 nIndex) const
         {
-#ifdef DBG_UTIL
-            if(nIndex >= mnCount)
+            assert(nIndex < mnCount && "Access out of range");
+            return mpContent[nIndex];
+        }
+
+        // data access read/write
+        BPixel& getBPixel(sal_uInt32 nIndex)
         {
-                OSL_FAIL("getZ: Access out of range (!)");
-                return mpZBuffer[0L];
+            assert(nIndex < mnCount && "Access out of range");
+            return mpContent[nIndex];
         }
-#endif
+
+        // data access read only
+        const sal_uInt16& getZ(sal_uInt32 nIndex) const
+        {
+            assert(nIndex < mnCount && "Access out of range");
             return mpZBuffer[nIndex];
         }
 
         // data access read/write
         sal_uInt16& getZ(sal_uInt32 nIndex)
         {
-#ifdef DBG_UTIL
-            if(nIndex >= mnCount)
-            {
-                OSL_FAIL("getZ: Access out of range (!)");
-                return mpZBuffer[0L];
-            }
-#endif
+            assert(nIndex < mnCount && "Access out of range");
             return mpZBuffer[nIndex];
         }
     };

solenv/clang-format/blacklist

@@ -5852,7 +5852,6 @@ include/basegfx/range/b2irectangle.hxx
 include/basegfx/range/b3drange.hxx
 include/basegfx/range/basicbox.hxx
 include/basegfx/range/basicrange.hxx
-include/basegfx/raster/bpixelraster.hxx
 include/basegfx/raster/bzpixelraster.hxx
 include/basegfx/raster/rasterconvert3d.hxx
 include/basegfx/tuple/b2dtuple.hxx