[Date Prev][Date Next][Thread Prev][Thread Next][Thread Index]
[XaraXtreme-dev] nodetxtl.cpp warnings
- From: Martin Wuerthner <lists@xxxxxxxxxxxxxxx>
- Date: Fri, 31 Mar 2006 17:10:41 +0200
- Subject: [XaraXtreme-dev] nodetxtl.cpp warnings
Find attached a patch to fix the compiler warnings in nodetxtl.cpp.
Martin
Index: Kernel/nodetxtl.cpp
===================================================================
--- Kernel/nodetxtl.cpp (Revision 750)
+++ Kernel/nodetxtl.cpp (Arbeitskopie)
@@ -1775,9 +1775,13 @@
return TRUE;
CCAttrMap *pAttribMap = new CCAttrMap(30);
- BOOL FoundAttributes = pFirstNode->FindAppliedAttributes(pAttribMap);
- if (pAttribMap == NULL)
+ if (pAttribMap == NULL) return FALSE;
+
+ if (!pFirstNode->FindAppliedAttributes(pAttribMap))
+ {
+ delete pAttribMap;
return FALSE;
+ }
CCAttrMap::iterator pos = pAttribMap->GetStartPosition();
CCAttrMap::iterator end = pAttribMap->GetEndPosition();
@@ -1814,7 +1818,7 @@
// get the char metrics for the specified character
wxDC *pDC = m_pFormatDC.get();
CharDescription FontDesc( FONTEMCHAR, RR_TXTFONTTYPEFACE(), RR_TXTBOLD(), RR_TXTITALIC() );
- if( FONTMANAGER->GetCharMetrics( m_pFormatDC.get(), ch, FontDesc, pCharMetrics ) == FALSE )
+ if( FONTMANAGER->GetCharMetrics( pDC, ch, FontDesc, pCharMetrics ) == FALSE )
return FALSE;
// get x/y scale factors and apply then to the default metrics found