diff options
Diffstat (limited to 'filter')
| -rw-r--r-- | filter/source/graphicfilter/ios2met/ios2met.cxx | 6 | ||||
| -rw-r--r-- | filter/source/graphicfilter/itiff/ccidecom.cxx | 3 |
2 files changed, 4 insertions, 5 deletions
diff --git a/filter/source/graphicfilter/ios2met/ios2met.cxx b/filter/source/graphicfilter/ios2met/ios2met.cxx index 5f5b54dba8b3..052ab9b877fc 100644 --- a/filter/source/graphicfilter/ios2met/ios2met.cxx +++ b/filter/source/graphicfilter/ios2met/ios2met.cxx @@ -487,7 +487,7 @@ OS2METReader::~OS2METReader() while (pBitmapList!=nullptr) { OSBitmap * p=pBitmapList; pBitmapList=p->pSucc; - if (p->pBMP!=nullptr) delete p->pBMP; + delete p->pBMP; delete p; } @@ -500,7 +500,7 @@ OS2METReader::~OS2METReader() while (pPaletteStack!=nullptr) { OSPalette * p=pPaletteStack; pPaletteStack=p->pSucc; - if (p->p0RGB!=nullptr) delete[] p->p0RGB; + delete[] p->p0RGB; delete p; } } @@ -2504,7 +2504,7 @@ void OS2METReader::ReadField(sal_uInt16 nFieldType, sal_uInt16 nFieldSize) OSPalette * pP=pPaletteStack; if (pP!=nullptr) { pPaletteStack=pP->pSucc; - if (pP->p0RGB!=nullptr) delete[] pP->p0RGB; + delete[] pP->p0RGB; delete pP; } break; diff --git a/filter/source/graphicfilter/itiff/ccidecom.cxx b/filter/source/graphicfilter/itiff/ccidecom.cxx index a30d5eb98cc1..c57813e98046 100644 --- a/filter/source/graphicfilter/itiff/ccidecom.cxx +++ b/filter/source/graphicfilter/itiff/ccidecom.cxx @@ -672,8 +672,7 @@ DecompressStatus CCIDecompressor::DecompressScanline( sal_uInt8 * pTarget, sal_u { if ( pLastLine == nullptr || nLastLineSize != ( ( nTargetBits + 7 ) >> 3 ) ) { - if ( pLastLine == nullptr ) - delete[] pLastLine; + delete[] pLastLine; nLastLineSize = ( nTargetBits + 7 ) >> 3; pLastLine = new sal_uInt8[ nLastLineSize ]; memset(pLastLine, 0, nLastLineSize); |