diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2014-11-24 10:10:11 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-11-24 20:40:42 +0000 |
| commit | 8ccf559473f185bdb7640e438e131f17ddc1861c (patch) | |
| tree | 3d7d01ea5b36aa733a1c76edc378c3b9654b50ba /vcl/win | |
| parent | 3a58704459a8e60ecca337a247331ac55b7672d3 (diff) | |
coverity#1255909 Uninitialized scalar field
Change-Id: I162199233c9d3feb03e7ab33b777174b2a03035a
Reviewed-on: https://gerrit.libreoffice.org/13104
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'vcl/win')
| -rw-r--r-- | vcl/win/source/gdi/salbmp.cxx | 20 |
1 files changed, 3 insertions, 17 deletions
diff --git a/vcl/win/source/gdi/salbmp.cxx b/vcl/win/source/gdi/salbmp.cxx index d4ae11ab1b2e..fd02f54e15e9 100644 --- a/vcl/win/source/gdi/salbmp.cxx +++ b/vcl/win/source/gdi/salbmp.cxx @@ -276,12 +276,7 @@ Gdiplus::Bitmap* WinSalBitmap::ImplCreateGdiPlusBitmap() if(pRGB && BMP_FORMAT_24BIT_TC_BGR != (pRGB->mnFormat & ~BMP_FORMAT_TOP_DOWN)) { // convert source bitmap to BMP_FORMAT_24BIT_TC_BGR format if not yet in that format - SalTwoRect aSalTwoRect; - - aSalTwoRect.mnSrcX = aSalTwoRect.mnSrcY = aSalTwoRect.mnDestX = aSalTwoRect.mnDestY = 0; - aSalTwoRect.mnSrcWidth = aSalTwoRect.mnDestWidth = pRGB->mnWidth; - aSalTwoRect.mnSrcHeight = aSalTwoRect.mnDestHeight = pRGB->mnHeight; - + SalTwoRect aSalTwoRect(0, 0, pRGB->mnWidth, pRGB->mnHeight, 0, 0, pRGB->mnWidth, pRGB->mnHeight); pExtraRGB = StretchAndConvert( *pRGB, aSalTwoRect, @@ -373,12 +368,7 @@ Gdiplus::Bitmap* WinSalBitmap::ImplCreateGdiPlusBitmap(const WinSalBitmap& rAlph if(pRGB && BMP_FORMAT_24BIT_TC_BGR != (pRGB->mnFormat & ~BMP_FORMAT_TOP_DOWN)) { // convert source bitmap to BMP_FORMAT_24BIT_TC_BGR format if not yet in that format - SalTwoRect aSalTwoRect; - - aSalTwoRect.mnSrcX = aSalTwoRect.mnSrcY = aSalTwoRect.mnDestX = aSalTwoRect.mnDestY = 0; - aSalTwoRect.mnSrcWidth = aSalTwoRect.mnDestWidth = pRGB->mnWidth; - aSalTwoRect.mnSrcHeight = aSalTwoRect.mnDestHeight = pRGB->mnHeight; - + SalTwoRect aSalTwoRect(0, 0, pRGB->mnWidth, pRGB->mnHeight, 0, 0, pRGB->mnWidth, pRGB->mnHeight); pExtraRGB = StretchAndConvert( *pRGB, aSalTwoRect, @@ -406,11 +396,7 @@ Gdiplus::Bitmap* WinSalBitmap::ImplCreateGdiPlusBitmap(const WinSalBitmap& rAlph if(pA && BMP_FORMAT_8BIT_PAL != (pA->mnFormat & ~BMP_FORMAT_TOP_DOWN)) { // convert alpha bitmap to BMP_FORMAT_8BIT_PAL format if not yet in that format - SalTwoRect aSalTwoRect; - - aSalTwoRect.mnSrcX = aSalTwoRect.mnSrcY = aSalTwoRect.mnDestX = aSalTwoRect.mnDestY = 0; - aSalTwoRect.mnSrcWidth = aSalTwoRect.mnDestWidth = pA->mnWidth; - aSalTwoRect.mnSrcHeight = aSalTwoRect.mnDestHeight = pA->mnHeight; + SalTwoRect aSalTwoRect(0, 0, pA->mnWidth, pA->mnHeight, 0, 0, pA->mnWidth, pA->mnHeight); const BitmapPalette& rTargetPalette = Bitmap::GetGreyPalette(256); pExtraA = StretchAndConvert( |