Commit b81ef981 authored by Oleg.Korshul's avatar Oleg.Korshul Committed by Alexander Trofimov

много мелких багов

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@61190 954022d7-b5bf-4e40-9824-e11837661b57
parent b9411dfb
......@@ -313,7 +313,10 @@ namespace agg
}
if (!bFindColor)
{
m_color_table[index] = m_pSubColors[m_nCountSubColors - 1];
if (m_pSubColors != NULL && m_nCountSubColors > 0)
m_color_table[index] = m_pSubColors[m_nCountSubColors - 1];
else
m_color_table[index] = color_type();
}
m_valid_table[index] = true;
......
......@@ -533,6 +533,7 @@ int CFontFile::SetCMapForCharCode(long lUnicode, int *pnCMapIndex)
}
else if ( FT_ENCODING_NONE == pEncoding || FT_ENCODING_MS_SYMBOL == pEncoding || FT_ENCODING_APPLE_ROMAN == pEncoding )
{
#if 0
FT_ULong charcode;
FT_UInt gindex;
......@@ -546,7 +547,8 @@ int CFontFile::SetCMapForCharCode(long lUnicode, int *pnCMapIndex)
*pnCMapIndex = nIndex;
break;
}
}
}
#endif
if ( nCharIndex = FT_Get_Char_Index( m_pFace, lUnicode ) )
{
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment