[Libreoffice-commits] core.git: canvas/source include/canvas

[Stephan Bergmann]

 canvas/source/directx/dx_9rm.cxx          |   40 ------------------------------
 include/canvas/rendering/icolorbuffer.hxx |    3 --
 2 files changed, 43 deletions(-)

New commits:
commit a6aa29db423a0f728e27a2219c3c411bf739fe3c
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Dec 2 08:07:17 2015 +0100

    Remove unused FMT_R8G8B8
    
    ...since 5b4d4af3e8bc3b5fb07bceecefc2a47d8e4b8b18 "bin agg"
    
    Change-Id: If86d294f812a670917b181f3bd140883ad2df71d
    Reviewed-on: https://gerrit.libreoffice.org/20348
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>
    Tested-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/canvas/source/directx/dx_9rm.cxx b/canvas/source/directx/dx_9rm.cxx
index 9677d16..7347874 100644
--- a/canvas/source/directx/dx_9rm.cxx
+++ b/canvas/source/directx/dx_9rm.cxx
@@ -423,46 +423,6 @@ namespace dxcanvas
                         }
                         break;
 
-                        case ::canvas::IColorBuffer::FMT_R8G8B8:
-                        {
-                            const std::size_t nSourceBytesPerPixel(3);
-                            const std::size_t nSourcePitchInBytes(rSource.getStride());
-                            pImage += rSourceRect.getMinY()*nSourcePitchInBytes;
-                            pImage += rSourceRect.getMinX()*nSourceBytesPerPixel;
-
-                            // calculate the destination memory address
-                            sal_uInt8 *pDst = (sal_uInt8*)aLockedRect.pBits;
-
-                            const sal_Int32 nNumColumns(
-                                sal::static_int_cast<sal_Int32>(rSourceRect.getWidth()));
-                            const sal_Int32 nNumLines(
-                                sal::static_int_cast<sal_Int32>(rSourceRect.getHeight()));
-                            for(sal_Int32 i=0; i<nNumLines; ++i)
-                            {
-                                sal_uInt32 *pDstScanline = reinterpret_cast<sal_uInt32 *>(pDst);
-                                sal_uInt8 *pSrcScanline = reinterpret_cast<sal_uInt8 *>(pImage);
-
-                                for(sal_Int32 x=0; x<nNumColumns; ++x)
-                                {
-                                    sal_uInt32 color(0xFF000000);
-                                    color |= pSrcScanline[2]<<16;
-                                    color |= pSrcScanline[1]<<8;
-                                    color |= pSrcScanline[0];
-                                    pSrcScanline += 3;
-                                    *pDstScanline++ = color;
-                                }
-                                if( bClearRightColumn )
-                                    *pDstScanline++ = 0xFF000000;
-
-                                pDst += aLockedRect.Pitch;
-                                pImage += nSourcePitchInBytes;
-                            }
-
-                            if( bClearBottomRow )
-                                memset(pDst, 0, 4*(nNumColumns+1));
-                        }
-                        break;
-
                         case ::canvas::IColorBuffer::FMT_X8R8G8B8:
                         {
                             const std::size_t nSourceBytesPerPixel(4);
diff --git a/include/canvas/rendering/icolorbuffer.hxx b/include/canvas/rendering/icolorbuffer.hxx
index 5439f65..5402f79 100644
--- a/include/canvas/rendering/icolorbuffer.hxx
+++ b/include/canvas/rendering/icolorbuffer.hxx
@@ -35,9 +35,6 @@ namespace canvas
         /// The underlying pixel format for this buffer
         enum Format
         {
-            // 24-bit RGB pixel format, 8 bits per channel.
-            FMT_R8G8B8,
-
             // 32-bit ARGB pixel format with alpha, 8 bits per channel.
             FMT_A8R8G8B8,