summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--vcl/inc/salbmp.hxx3
-rw-r--r--vcl/opengl/salbmp.cxx138
-rw-r--r--vcl/source/bitmap/salbmp.cxx143
3 files changed, 149 insertions, 135 deletions
diff --git a/vcl/inc/salbmp.hxx b/vcl/inc/salbmp.hxx
index 103856dfae26..b952c8ce4f61 100644
--- a/vcl/inc/salbmp.hxx
+++ b/vcl/inc/salbmp.hxx
@@ -102,6 +102,9 @@ protected:
protected:
virtual void updateChecksum() const;
+ // helper function to convert data in 1,2,4 bpp formats to a 24bpp format
+ static std::unique_ptr< sal_uInt8[] > convertDataTo24Bpp( const sal_uInt8* src,
+ int width, int height, int bitCount, int bytesPerRow, const BitmapPalette& palette, bool toBgr );
};
#endif
diff --git a/vcl/opengl/salbmp.cxx b/vcl/opengl/salbmp.cxx
index 36c34a2b3b92..f3147cdcc101 100644
--- a/vcl/opengl/salbmp.cxx
+++ b/vcl/opengl/salbmp.cxx
@@ -307,103 +307,6 @@ void OpenGLSalBitmap::DeallocateUserData()
namespace {
-class ImplPixelFormat
-{
-protected:
- sal_uInt8* mpData;
-public:
- static ImplPixelFormat* GetFormat( sal_uInt16 nBits, const BitmapPalette& rPalette );
-
- virtual void StartLine( sal_uInt8* pLine ) { mpData = pLine; }
- virtual const BitmapColor& ReadPixel() = 0;
- virtual ~ImplPixelFormat() { }
-};
-
-class ImplPixelFormat8 : public ImplPixelFormat
-{
-private:
- const BitmapPalette& mrPalette;
-
-public:
- explicit ImplPixelFormat8( const BitmapPalette& rPalette )
- : mrPalette( rPalette )
- {
- }
- virtual const BitmapColor& ReadPixel() override
- {
- assert( mrPalette.GetEntryCount() > *mpData );
- return mrPalette[ *mpData++ ];
- }
-};
-
-class ImplPixelFormat4 : public ImplPixelFormat
-{
-private:
- const BitmapPalette& mrPalette;
- sal_uInt32 mnX;
- sal_uInt32 mnShift;
-
-public:
- explicit ImplPixelFormat4( const BitmapPalette& rPalette )
- : mrPalette( rPalette )
- , mnX(0)
- , mnShift(4)
- {
- }
- virtual void StartLine( sal_uInt8* pLine ) override
- {
- mpData = pLine;
- mnX = 0;
- mnShift = 4;
- }
- virtual const BitmapColor& ReadPixel() override
- {
- sal_uInt32 nIdx = ( mpData[mnX >> 1] >> mnShift) & 0x0f;
- assert( mrPalette.GetEntryCount() > nIdx );
- const BitmapColor& rColor = mrPalette[nIdx];
- mnX++;
- mnShift ^= 4;
- return rColor;
- }
-};
-
-class ImplPixelFormat1 : public ImplPixelFormat
-{
-private:
- const BitmapPalette& mrPalette;
- sal_uInt32 mnX;
-
-public:
- explicit ImplPixelFormat1( const BitmapPalette& rPalette )
- : mrPalette(rPalette)
- , mnX(0)
- {
- }
- virtual void StartLine( sal_uInt8* pLine ) override
- {
- mpData = pLine;
- mnX = 0;
- }
- virtual const BitmapColor& ReadPixel() override
- {
- const BitmapColor& rColor = mrPalette[ (mpData[mnX >> 3 ] >> ( 7 - ( mnX & 7 ) )) & 1];
- mnX++;
- return rColor;
- }
-};
-
-ImplPixelFormat* ImplPixelFormat::GetFormat( sal_uInt16 nBits, const BitmapPalette& rPalette )
-{
- switch( nBits )
- {
- case 1: return new ImplPixelFormat1( rPalette );
- case 4: return new ImplPixelFormat4( rPalette );
- case 8: return new ImplPixelFormat8( rPalette );
- }
-
- return nullptr;
-}
-
void lclInstantiateTexture(OpenGLTexture& rTexture, const int nWidth, const int nHeight,
const GLenum nFormat, const GLenum nType, sal_uInt8 const * pData)
{
@@ -498,46 +401,11 @@ GLuint OpenGLSalBitmap::CreateTexture()
else
{
VCL_GL_INFO( "::CreateTexture - convert from " << mnBits << " to 24 bits" );
-
// convert to 24 bits RGB using palette
- pData = new sal_uInt8[mnHeight * mnWidth * 3];
- bAllocated = true;
determineTextureFormat(24, nFormat, nType);
-
- std::unique_ptr<ImplPixelFormat> pSrcFormat(ImplPixelFormat::GetFormat(mnBits, maPalette));
-
- sal_uInt8* pSrcData = mpUserBuffer.get();
- sal_uInt8* pDstData = pData;
-
- sal_uInt32 nY = mnHeight;
- while( nY-- )
- {
- pSrcFormat->StartLine( pSrcData );
-
- sal_uInt32 nX = mnWidth;
- if (nFormat == GL_BGR)
- {
- while( nX-- )
- {
- const BitmapColor& c = pSrcFormat->ReadPixel();
- *pDstData++ = c.GetBlue();
- *pDstData++ = c.GetGreen();
- *pDstData++ = c.GetRed();
- }
- }
- else // RGB
- {
- while( nX-- )
- {
- const BitmapColor& c = pSrcFormat->ReadPixel();
- *pDstData++ = c.GetRed();
- *pDstData++ = c.GetGreen();
- *pDstData++ = c.GetBlue();
- }
- }
-
- pSrcData += mnBytesPerRow;
- }
+ pData = convertDataTo24Bpp( mpUserBuffer.get(), mnWidth, mnHeight,
+ mnBits, mnBytesPerRow, maPalette, nFormat == GL_BGR ).release();
+ bAllocated = true;
}
}
diff --git a/vcl/source/bitmap/salbmp.cxx b/vcl/source/bitmap/salbmp.cxx
index d1c4809007cc..0cf6fd3ab93a 100644
--- a/vcl/source/bitmap/salbmp.cxx
+++ b/vcl/source/bitmap/salbmp.cxx
@@ -41,4 +41,147 @@ void SalBitmap::updateChecksum() const
}
}
+namespace
+{
+
+class ImplPixelFormat
+{
+protected:
+ const sal_uInt8* mpData;
+public:
+ static ImplPixelFormat* GetFormat( sal_uInt16 nBits, const BitmapPalette& rPalette );
+
+ virtual void StartLine( const sal_uInt8* pLine ) { mpData = pLine; }
+ virtual const BitmapColor& ReadPixel() = 0;
+ virtual ~ImplPixelFormat() { }
+};
+
+class ImplPixelFormat8 : public ImplPixelFormat
+{
+private:
+ const BitmapPalette& mrPalette;
+
+public:
+ explicit ImplPixelFormat8( const BitmapPalette& rPalette )
+ : mrPalette( rPalette )
+ {
+ }
+ virtual const BitmapColor& ReadPixel() override
+ {
+ assert( mrPalette.GetEntryCount() > *mpData );
+ return mrPalette[ *mpData++ ];
+ }
+};
+
+class ImplPixelFormat4 : public ImplPixelFormat
+{
+private:
+ const BitmapPalette& mrPalette;
+ sal_uInt32 mnX;
+ sal_uInt32 mnShift;
+
+public:
+ explicit ImplPixelFormat4( const BitmapPalette& rPalette )
+ : mrPalette( rPalette )
+ , mnX(0)
+ , mnShift(4)
+ {
+ }
+ virtual void StartLine( const sal_uInt8* pLine ) override
+ {
+ mpData = pLine;
+ mnX = 0;
+ mnShift = 4;
+ }
+ virtual const BitmapColor& ReadPixel() override
+ {
+ sal_uInt32 nIdx = ( mpData[mnX >> 1] >> mnShift) & 0x0f;
+ assert( mrPalette.GetEntryCount() > nIdx );
+ const BitmapColor& rColor = mrPalette[nIdx];
+ mnX++;
+ mnShift ^= 4;
+ return rColor;
+ }
+};
+
+class ImplPixelFormat1 : public ImplPixelFormat
+{
+private:
+ const BitmapPalette& mrPalette;
+ sal_uInt32 mnX;
+
+public:
+ explicit ImplPixelFormat1( const BitmapPalette& rPalette )
+ : mrPalette(rPalette)
+ , mnX(0)
+ {
+ }
+ virtual void StartLine( const sal_uInt8* pLine ) override
+ {
+ mpData = pLine;
+ mnX = 0;
+ }
+ virtual const BitmapColor& ReadPixel() override
+ {
+ const BitmapColor& rColor = mrPalette[ (mpData[mnX >> 3 ] >> ( 7 - ( mnX & 7 ) )) & 1];
+ mnX++;
+ return rColor;
+ }
+};
+
+ImplPixelFormat* ImplPixelFormat::GetFormat( sal_uInt16 nBits, const BitmapPalette& rPalette )
+{
+ switch( nBits )
+ {
+ case 1: return new ImplPixelFormat1( rPalette );
+ case 4: return new ImplPixelFormat4( rPalette );
+ case 8: return new ImplPixelFormat8( rPalette );
+ }
+
+ return nullptr;
+}
+
+} // namespace
+
+std::unique_ptr< sal_uInt8[] > SalBitmap::convertDataTo24Bpp( const sal_uInt8* src,
+ int width, int height, int bitCount, int bytesPerRow, const BitmapPalette& palette, bool toBgr )
+{
+ std::unique_ptr< sal_uInt8[] > data( new sal_uInt8[width * height * 3] );
+ std::unique_ptr<ImplPixelFormat> pSrcFormat(ImplPixelFormat::GetFormat(bitCount, palette));
+
+ const sal_uInt8* pSrcData = src;
+ sal_uInt8* pDstData = data.get();
+
+ sal_uInt32 nY = height;
+ while( nY-- )
+ {
+ pSrcFormat->StartLine( pSrcData );
+
+ sal_uInt32 nX = width;
+ if (toBgr)
+ {
+ while( nX-- )
+ {
+ const BitmapColor& c = pSrcFormat->ReadPixel();
+ *pDstData++ = c.GetBlue();
+ *pDstData++ = c.GetGreen();
+ *pDstData++ = c.GetRed();
+ }
+ }
+ else // RGB
+ {
+ while( nX-- )
+ {
+ const BitmapColor& c = pSrcFormat->ReadPixel();
+ *pDstData++ = c.GetRed();
+ *pDstData++ = c.GetGreen();
+ *pDstData++ = c.GetBlue();
+ }
+ }
+
+ pSrcData += bytesPerRow;
+ }
+ return data;
+}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
generated by cgit (git 2.34.1) at 2025-02-12 11:38:54 +0000