Author: hdu
Date: Tue Sep 10 13:58:11 2013
New Revision: 1521489
URL: http://svn.apache.org/r1521489
Log:
#i122985# fix compile error in pngreader.cxx for product build with debug
enabled
Modified:
openoffice/branches/AOO401/ (props changed)
openoffice/branches/AOO401/main/ (props changed)
openoffice/branches/AOO401/main/vcl/ (props changed)
openoffice/branches/AOO401/main/vcl/source/gdi/pngread.cxx
Propchange: openoffice/branches/AOO401/
------------------------------------------------------------------------------
Merged /openoffice/trunk:r1521488
Propchange: openoffice/branches/AOO401/main/
------------------------------------------------------------------------------
Merged /openoffice/trunk/main:r1521488
Propchange: openoffice/branches/AOO401/main/vcl/
------------------------------------------------------------------------------
Merged /openoffice/trunk/main/vcl:r1521488
Modified: openoffice/branches/AOO401/main/vcl/source/gdi/pngread.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO401/main/vcl/source/gdi/pngread.cxx?rev=1521489&r1=1521488&r2=1521489&view=diff
==============================================================================
--- openoffice/branches/AOO401/main/vcl/source/gdi/pngread.cxx (original)
+++ openoffice/branches/AOO401/main/vcl/source/gdi/pngread.cxx Tue Sep 10
13:58:11 2013
@@ -1414,8 +1414,10 @@ void PNGReaderImpl::ImplDrawScanline( sa
{
OSL_ENSURE(mpScanline, "No Scanline allocated (!)");
OSL_ENSURE(mpScanlineAlpha, "No ScanlineAlpha allocated
(!)");
+#ifdef DBG_UTIL
OSL_ENSURE(mnAllocSizeScanline >= maOrigSize.Width() * 3,
"Allocated Scanline too small (!)");
OSL_ENSURE(mnAllocSizeScanlineAlpha >= maOrigSize.Width(),
"Allocated ScanlineAlpha too small (!)");
+#endif
sal_uInt8* pScanline(mpScanline);
sal_uInt8* pScanlineAlpha(mpScanlineAlpha);
@@ -1549,7 +1551,9 @@ void PNGReaderImpl::ImplDrawScanline( sa
if(bDoDirectScanline)
{
OSL_ENSURE(mpScanline, "No Scanline allocated (!)");
+#ifdef DBG_UTIL
OSL_ENSURE(mnAllocSizeScanline >= maOrigSize.Width() * 3,
"Allocated Scanline too small (!)");
+#endif
sal_uInt8* pScanline(mpScanline);
for(sal_uInt32 nX(0); nX < maOrigSize.Width(); nX++, pTmp
+= 3)
