move Bitmap::SetToData to BitmapTools

Change-Id: I0fc62d29d2044c2aa8af3742d4aeb9d782793713
Reviewed-on: https://gerrit.libreoffice.org/49280
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
Tested-by: Tomaž Vajngerl <quikee@gmail.com>

2 files changed, 11 insertions, 10 deletions

diff --git a/include/vcl/BitmapTools.hxx b/include/vcl/BitmapTools.hxx
index 3517a9d0dd5c..ed448dfa0e1c 100644
--- a/include/vcl/BitmapTools.hxx
+++ b/include/vcl/BitmapTools.hxx
@@ -22,6 +22,17 @@ BitmapEx VCL_DLLPUBLIC loadFromName(const OUString& rFileName, const ImageLoadFl
 
 void loadFromSvg(SvStream& rStream, const OUString& sPath, BitmapEx& rBitmapEx, double fScaleFactor);
 
+/** Copy block of image data into the bitmap.
+    Assumes that the Bitmap has been constructed with the desired size.
+
+    @param pData
+    The block of data to copy
+    @param nStride
+    The number of bytes in a scanline, must >= width
+*/
+BitmapEx VCL_DLLPUBLIC CreateFromData( sal_uInt8 const *pData, sal_Int32 nWidth, sal_Int32 nHeight, sal_Int32 nStride, sal_uInt16 nBitCount );
+
+
 }} // end vcl::bitmap
 
 #endif // INCLUDED_VCL_BITMAP_TOOLS_HXX
diff --git a/include/vcl/bitmap.hxx b/include/vcl/bitmap.hxx
index 04cc0cbca83d..2f74b71dd7b3 100644
--- a/include/vcl/bitmap.hxx
+++ b/include/vcl/bitmap.hxx
@@ -650,16 +650,6 @@ public:
                                 BmpFilter eFilter,
                                 const BmpFilterParam* pFilterParam = nullptr );
 
-    /** Copy block of image data into the bitmap.
-        Assumes that the Bitmap has been constructed with the desired size.
-
-        @param pData
-        The block of data to copy
-        @param nStride
-        The number of bytes in a scanline, must >= width
-     */
-    void                    SetToData( sal_uInt8 const *pData, sal_Int32 nStride );
-
 public:
 
     SAL_DLLPRIVATE void     ImplMakeUnique();