Commit 8c43c781 authored by Alexey.Musinov's avatar Alexey.Musinov

fix build

parent 7496de06
...@@ -276,7 +276,7 @@ public: ...@@ -276,7 +276,7 @@ public:
#endif #endif
#ifdef _IOS #ifdef _IOS
CArray<std::wstring> GetSetupFontFiles_ios(); std::vector<std::wstring> GetSetupFontFiles_ios();
#endif #endif
CFontManager* GenerateFontManager(); CFontManager* GenerateFontManager();
......
...@@ -653,7 +653,7 @@ std::vector<std::wstring> CApplicationFontsWorker::CheckApplication(bool bIsNeed ...@@ -653,7 +653,7 @@ std::vector<std::wstring> CApplicationFontsWorker::CheckApplication(bool bIsNeed
{ {
std::vector<std::wstring> arrNames; std::vector<std::wstring> arrNames;
CArray<std::wstring> fonts; std::vector<std::wstring> fonts;
CApplicationFonts oFonts; CApplicationFonts oFonts;
pDataDst = NULL; pDataDst = NULL;
...@@ -676,19 +676,19 @@ std::vector<std::wstring> CApplicationFontsWorker::CheckApplication(bool bIsNeed ...@@ -676,19 +676,19 @@ std::vector<std::wstring> CApplicationFontsWorker::CheckApplication(bool bIsNeed
int nLenAllFonts = oReader.GetInt32(); int nLenAllFonts = oReader.GetInt32();
oReader.Skip(nLenAllFonts); oReader.Skip(nLenAllFonts);
CArray<std::wstring> arrOld; std::vector<std::wstring> arrOld;
int nCountCache = oReader.GetInt32(); int nCountCache = oReader.GetInt32();
for (int i = 0; i < nCountCache; ++i) for (int i = 0; i < nCountCache; ++i)
{ {
int nLen = oReader.GetInt32(); int nLen = oReader.GetInt32();
arrOld.Add(NSFile::CUtf8Converter::GetUnicodeStringFromUTF8(oReader.GetCur(), (LONG)nLen)); arrOld.push_back(NSFile::CUtf8Converter::GetUnicodeStringFromUTF8(oReader.GetCur(), (LONG)nLen));
oReader.Skip(nLen); oReader.Skip(nLen);
} }
if (fonts.GetCount() == arrOld.GetCount()) if (fonts.size() == arrOld.size())
{ {
int nCountFonts = fonts.GetCount(); int nCountFonts = (int)fonts.size();
bool bIsBreak = false; bool bIsBreak = false;
for (int i = 0 ; i < nCountFonts; ++i) for (int i = 0 ; i < nCountFonts; ++i)
{ {
...@@ -726,7 +726,7 @@ std::vector<std::wstring> CApplicationFontsWorker::CheckApplication(bool bIsNeed ...@@ -726,7 +726,7 @@ std::vector<std::wstring> CApplicationFontsWorker::CheckApplication(bool bIsNeed
std::string sAllFontsJS = NSFile::CUtf8Converter::GetUtf8StringFromUnicode2(oWriterJS.GetBuffer(), (LONG)oWriterJS.GetCurSize()); std::string sAllFontsJS = NSFile::CUtf8Converter::GetUtf8StringFromUnicode2(oWriterJS.GetBuffer(), (LONG)oWriterJS.GetCurSize());
oStream.WriteStringA2(sAllFontsJS.c_str(), (int)sAllFontsJS.length()); oStream.WriteStringA2(sAllFontsJS.c_str(), (int)sAllFontsJS.length());
int nCountF = fonts.GetCount(); int nCountF = (int)fonts.size();
oStream.WriteLONG((LONG)nCountF); oStream.WriteLONG((LONG)nCountF);
for (int i = 0; i < nCountF; ++i) for (int i = 0; i < nCountF; ++i)
......
...@@ -7,12 +7,12 @@ ...@@ -7,12 +7,12 @@
#import <UIKit/UIKit.h> #import <UIKit/UIKit.h>
CArray<std::wstring> CApplicationFonts::GetSetupFontFiles_ios() std::vector<std::wstring> CApplicationFonts::GetSetupFontFiles_ios()
{ {
CArray<std::wstring> oArray; std::vector<std::wstring> oArray;
NSDirectory::GetFiles2(L"/System/Library/Fonts", oArray, true); NSDirectory::GetFiles2(L"/System/Library/Fonts", oArray, true);
if (oArray.GetCount() == 0) if (oArray.size() == 0)
{ {
NSDirectory::GetFiles2(L"/Library/Fonts", oArray, true); NSDirectory::GetFiles2(L"/Library/Fonts", oArray, true);
} }
......
...@@ -31,7 +31,7 @@ bool CAscEditorPDFPrinter::Print(std::string strBase64, std::wstring strDstFile) ...@@ -31,7 +31,7 @@ bool CAscEditorPDFPrinter::Print(std::string strBase64, std::wstring strDstFile)
CApplicationFonts oFonts; CApplicationFonts oFonts;
CFontManager* pFontManager = NULL; CFontManager* pFontManager = NULL;
CArray<std::wstring> fonts; std::vector<std::wstring> fonts;
if (m_bUseSystemFonts) if (m_bUseSystemFonts)
{ {
fonts = oFonts.GetSetupFontFiles(); fonts = oFonts.GetSetupFontFiles();
......
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