either copy the whole thing exactly, or convert between types

Change-Id: Ied1b4f81e2e851b639cc9a514659160b8571e92f

basebmp/source/bitmapdevice.cxx

@@ -146,18 +146,6 @@ namespace
 
     private:
 
-        static std::shared_ptr<BitmapRenderer> getCompatibleBitmap( const BitmapDeviceSharedPtr& bmp )
-        {
-            return std::dynamic_pointer_cast< BitmapRenderer >( bmp );
-        }
-
-        virtual bool isCompatibleBitmap( const BitmapDeviceSharedPtr& bmp ) const override
-        {
-            // TODO(P1): dynamic_cast usually called twice for
-            // compatible formats
-            return getCompatibleBitmap(bmp).get() != nullptr;
-        }
-
         virtual Color getPixel_i(const basegfx::B2IPoint& rPt ) override
         {
             const DestIterator pixel( maBegin +
@@ -166,21 +154,6 @@ namespace
             return maAccessor(pixel);
         }
 
-        template< typename Iterator, typename RawAcc >
-        void implDrawBitmap(const BitmapDeviceSharedPtr& rSrcBitmap,
-                            const Iterator&              begin,
-                            const RawAcc&                acc)
-        {
-            const basegfx::B2IVector& rSrcSize( rSrcBitmap->getSize() );
-            const basegfx::B2IBox     aRect(0, 0, rSrcSize.getX(),rSrcSize.getY());
-
-            std::shared_ptr<BitmapRenderer> pSrcBmp( getCompatibleBitmap(rSrcBitmap) );
-            OSL_ASSERT( pSrcBmp );
-
-            vigra::copyImage( pSrcBmp->maBegin, pSrcBmp->maBegin + bottomRight(aRect), pSrcBmp->maRawAccessor,
-                              begin, acc );
-        }
-
         template< typename Iterator, typename Acc > static
         void implDrawBitmapGeneric(const BitmapDeviceSharedPtr& rSrcBitmap,
                                    const Iterator&              begin,
@@ -195,49 +168,9 @@ namespace
                               begin, acc );
         }
 
-        void implDrawBitmapDirect(const BitmapDeviceSharedPtr& rSrcBitmap)
-        {
-            const basegfx::B2IVector& rSrcSize(rSrcBitmap->getSize());
-
-            sal_Int32 nSrcWidth = rSrcSize.getX();
-            sal_Int32 nSrcHeight = rSrcSize.getY();
-
-            char* dstBuf =  reinterpret_cast<char*>(getBuffer().get());
-            char* srcBuf =  reinterpret_cast<char*>(rSrcBitmap->getBuffer().get());
-            sal_Int32 dstStride =  getScanlineStride();
-            sal_Int32 srcStride =  rSrcBitmap->getScanlineStride();
-            sal_Int32 bytesPerPixel = (bitsPerPixel[getScanlineFormat()] + 7) >> 3; // round up to bytes
-
-            char* dstline = dstBuf;
-            char* srcline = srcBuf;
-            sal_Int32 lineBytes = nSrcWidth * bytesPerPixel;
-
-            for(; 0 < nSrcHeight; nSrcHeight--)
-            {
-                memmove(dstline, srcline, lineBytes);
-                dstline += dstStride;
-                srcline += srcStride;
-            }
-        }
-
-        virtual void copyBitmap_i(const BitmapDeviceSharedPtr& rSrcBitmap) override
+        virtual void convertBitmap_i(const BitmapDeviceSharedPtr& rSrcBitmap) override
         {
-            if( isCompatibleBitmap( rSrcBitmap ) )
-            {
-                if (bitsPerPixel[getScanlineFormat()] >= 8
-                         && rSrcBitmap->getScanlineFormat() == getScanlineFormat())
-                    implDrawBitmapDirect(rSrcBitmap);
-                else
-                    implDrawBitmap(rSrcBitmap,
-                                   maBegin,
-                                   maRawAccessor);
-            }
-            else
-            {
-                implDrawBitmapGeneric(rSrcBitmap,
-                                      maBegin,
-                                      maAccessor);
-            }
+            implDrawBitmapGeneric(rSrcBitmap, maBegin, maAccessor);
         }
     };
 } // namespace
@@ -330,12 +263,11 @@ Color BitmapDevice::getPixel( const basegfx::B2IPoint& rPt )
     return Color();
 }
 
-void BitmapDevice::copyBitmap( const BitmapDeviceSharedPtr& rSrcBitmap )
+void BitmapDevice::convertBitmap( const BitmapDeviceSharedPtr& rSrcBitmap )
 {
-    copyBitmap_i( rSrcBitmap );
+    convertBitmap_i(rSrcBitmap);
 }
 
-
 /// Produces a specialized renderer for the given pixel format
 template< class FormatTraits >
 BitmapDeviceSharedPtr createRenderer(
@@ -670,11 +602,19 @@ BitmapDeviceSharedPtr createBitmapDevice( const basegfx::B2IVector&        rSize
 
 BitmapDeviceSharedPtr cloneBitmapDevice(const BitmapDeviceSharedPtr& rProto)
 {
-    BitmapDeviceSharedPtr aCopy = createBitmapDeviceImpl(rProto->getSize(),
+    const basegfx::B2IVector& rSrcSize(rProto->getSize());
+
+    BitmapDeviceSharedPtr aCopy = createBitmapDeviceImpl(rSrcSize,
                                    rProto->getScanlineFormat(),
                                    boost::shared_array< sal_uInt8 >(),
                                    rProto->getPalette() );
-    aCopy->copyBitmap(rProto);
+
+    const sal_Int32 nSrcHeight = rSrcSize.getY();
+    char* dstBuf =  reinterpret_cast<char*>(aCopy->getBuffer().get());
+    char* srcBuf =  reinterpret_cast<char*>(rProto->getBuffer().get());
+    const sal_Int32 nStride = rProto->getScanlineStride();
+    memcpy(dstBuf, srcBuf, nStride * nSrcHeight);
+
     return aCopy;
 }
 

include/basebmp/bitmapdevice.hxx

@@ -102,7 +102,7 @@ public:
         @param rSrcBitmap
         Bitmap to render into this one.
      */
-    void copyBitmap( const BitmapDeviceSharedPtr& rSrcBitmap );
+    void convertBitmap( const BitmapDeviceSharedPtr& rSrcBitmap );
 
 protected:
     BASEBMP_DLLPRIVATE BitmapDevice( const basegfx::B2IBox&           rBounds,
@@ -116,13 +116,10 @@ protected:
     BitmapDevice& operator=( const BitmapDevice& ) = delete;
 
 private:
-    BASEBMP_DLLPRIVATE virtual bool isCompatibleBitmap( const BitmapDeviceSharedPtr& bmp ) const = 0;
 
     BASEBMP_DLLPRIVATE virtual Color getPixel_i( const basegfx::B2IPoint& rPt ) = 0;
 
-    BASEBMP_DLLPRIVATE virtual void copyBitmap_i( const BitmapDeviceSharedPtr& rSrcBitmap ) = 0;
-
-    BitmapDeviceSharedPtr getGenericRenderer() const;
+    BASEBMP_DLLPRIVATE virtual void convertBitmap_i( const BitmapDeviceSharedPtr& rSrcBitmap ) = 0;
 
     std::unique_ptr< ImplBitmapDevice > mpImpl;
 };

vcl/headless/svpgdi.cxx

@@ -131,7 +131,7 @@ namespace
                 aTmpBmp.Create(aSize, 0, BitmapPalette());
                 assert(aTmpBmp.GetBitCount() == 32);
                 const basebmp::BitmapDeviceSharedPtr& rTmpSrc = aTmpBmp.getBitmap();
-                rTmpSrc->copyBitmap(rSrcBmp);
+                rTmpSrc->convertBitmap(rSrcBmp);
                 source = SvpSalGraphics::createCairoSurface(rTmpSrc);
             }
             else