Common folder housekeeping part 2.
This commit is contained in:
@@ -482,9 +482,10 @@ void PDF_PLOTTER::PlotImage( const wxImage& aImage, const VECTOR2I& aPos, double
|
||||
if( image.HasAlpha() != aCurrImage.HasAlpha() )
|
||||
continue;
|
||||
|
||||
if( image.HasMask() != aCurrImage.HasMask() || image.GetMaskRed() != aCurrImage.GetMaskRed()
|
||||
|| image.GetMaskGreen() != aCurrImage.GetMaskGreen()
|
||||
|| image.GetMaskBlue() != aCurrImage.GetMaskBlue() )
|
||||
if( image.HasMask() != aCurrImage.HasMask()
|
||||
|| image.GetMaskRed() != aCurrImage.GetMaskRed()
|
||||
|| image.GetMaskGreen() != aCurrImage.GetMaskGreen()
|
||||
|| image.GetMaskBlue() != aCurrImage.GetMaskBlue() )
|
||||
continue;
|
||||
|
||||
int pixCount = image.GetWidth() * image.GetHeight();
|
||||
@@ -492,7 +493,8 @@ void PDF_PLOTTER::PlotImage( const wxImage& aImage, const VECTOR2I& aPos, double
|
||||
if( memcmp( image.GetData(), aCurrImage.GetData(), pixCount * 3 ) != 0 )
|
||||
continue;
|
||||
|
||||
if( image.HasAlpha() && memcmp( image.GetAlpha(), aCurrImage.GetAlpha(), pixCount ) != 0 )
|
||||
if( image.HasAlpha()
|
||||
&& memcmp( image.GetAlpha(), aCurrImage.GetAlpha(), pixCount ) != 0 )
|
||||
continue;
|
||||
|
||||
return imgHandle;
|
||||
@@ -886,7 +888,6 @@ void PDF_PLOTTER::ClosePage()
|
||||
pageOutlineName = wxString::Format( _( "%s (Page %s)" ), m_pageName, m_pageNumbers.back() );
|
||||
}
|
||||
|
||||
|
||||
int actionHandle = emitGoToAction( pageHandle );
|
||||
OUTLINE_NODE* pageOutlineNode =
|
||||
addOutlineNode( m_outlineRoot.get(), actionHandle, pageOutlineName );
|
||||
@@ -1477,7 +1478,6 @@ function ShM(aEntries) {
|
||||
">>\n", (long) m_pageHandles.size() );
|
||||
closePdfObject();
|
||||
|
||||
|
||||
// The info dictionary
|
||||
int infoDictHandle = startPdfObject();
|
||||
char date_buf[250];
|
||||
|
||||
Reference in New Issue
Block a user