Commit e161de35 authored by Elen.Subbotina's avatar Elen.Subbotina Committed by Alexander Trofimov

x2t linux build - base64_encode унифицирована для linux и iOs

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@63556 954022d7-b5bf-4e40-9824-e11837661b57
parent 43b82290
...@@ -3354,11 +3354,7 @@ namespace BinXlsxRW { ...@@ -3354,11 +3354,7 @@ namespace BinXlsxRW {
int nBinBufferLen = oBufferedStream.GetPosition(); int nBinBufferLen = oBufferedStream.GetPosition();
int nBase64BufferLen = Base64::Base64EncodeGetRequiredLength(nBinBufferLen, Base64::B64_BASE64_FLAG_NOCRLF); int nBase64BufferLen = Base64::Base64EncodeGetRequiredLength(nBinBufferLen, Base64::B64_BASE64_FLAG_NOCRLF);
BYTE* pbBase64Buffer = new BYTE[nBase64BufferLen]; BYTE* pbBase64Buffer = new BYTE[nBase64BufferLen];
#ifdef _IOS
if(true == Base64_1::Base64Encode(pbBinBuffer, nBinBufferLen, pbBase64Buffer, &nBase64BufferLen)) if(true == Base64_1::Base64Encode(pbBinBuffer, nBinBufferLen, pbBase64Buffer, &nBase64BufferLen))
#else
if(true == Base64::Base64Encode(pbBinBuffer, nBinBufferLen, (LPSTR)pbBase64Buffer, &nBase64BufferLen, Base64::B64_BASE64_FLAG_NOCRLF))
#endif
{ {
CFile oFile; CFile oFile;
oFile.CreateFile(sFileDst); oFile.CreateFile(sFileDst);
...@@ -3507,11 +3503,7 @@ namespace BinXlsxRW { ...@@ -3507,11 +3503,7 @@ namespace BinXlsxRW {
{ {
int nBase64BufferLen = Base64::Base64EncodeGetRequiredLength(nLength, Base64::B64_BASE64_FLAG_NOCRLF); int nBase64BufferLen = Base64::Base64EncodeGetRequiredLength(nLength, Base64::B64_BASE64_FLAG_NOCRLF);
BYTE* pbBase64Buffer = new BYTE[nBase64BufferLen]; BYTE* pbBase64Buffer = new BYTE[nBase64BufferLen];
#ifdef _IOS
if(true == Base64_1::Base64Encode(pData, nLength, pbBase64Buffer, &nBase64BufferLen)) if(true == Base64_1::Base64Encode(pData, nLength, pbBase64Buffer, &nBase64BufferLen))
#else
if(true == Base64::Base64Encode(pData, nLength, (LPSTR)pbBase64Buffer, &nBase64BufferLen, Base64::B64_BASE64_FLAG_NOCRLF))
#endif
{ {
CFile oFile; CFile oFile;
oFile.CreateFile(sFileOutput); oFile.CreateFile(sFileOutput);
...@@ -3696,11 +3688,7 @@ namespace BinXlsxRW { ...@@ -3696,11 +3688,7 @@ namespace BinXlsxRW {
int nBinBufferLen = oBufferedStream.GetPosition(); int nBinBufferLen = oBufferedStream.GetPosition();
int nBase64BufferLen = Base64::Base64EncodeGetRequiredLength(nBinBufferLen, Base64::B64_BASE64_FLAG_NOCRLF); int nBase64BufferLen = Base64::Base64EncodeGetRequiredLength(nBinBufferLen, Base64::B64_BASE64_FLAG_NOCRLF);
BYTE* pbBase64Buffer = new BYTE[nBase64BufferLen]; BYTE* pbBase64Buffer = new BYTE[nBase64BufferLen];
#ifdef _IOS if(true == Base64_1::Base64Encode(pbBinBuffer, nBinBufferLen, (LPSTR)pbBase64Buffer, &nBase64BufferLen, Base64::B64_BASE64_FLAG_NOCRLF))
if(true == Base64_1::Base64Encode(pbBinBuffer, nBinBufferLen, pbBase64Buffer, &nBase64BufferLen))
#else
if(true == Base64::Base64Encode(pbBinBuffer, nBinBufferLen, (LPSTR)pbBase64Buffer, &nBase64BufferLen, Base64::B64_BASE64_FLAG_NOCRLF))
#endif
{ {
CFile oFile; CFile oFile;
oFile.CreateFile(sFileOutput); oFile.CreateFile(sFileOutput);
...@@ -3757,11 +3745,7 @@ namespace BinXlsxRW { ...@@ -3757,11 +3745,7 @@ namespace BinXlsxRW {
int nBinBufferLen = oBufferedStream.GetPosition(); int nBinBufferLen = oBufferedStream.GetPosition();
int nBase64BufferLen = Base64::Base64EncodeGetRequiredLength(nBinBufferLen, Base64::B64_BASE64_FLAG_NOCRLF); int nBase64BufferLen = Base64::Base64EncodeGetRequiredLength(nBinBufferLen, Base64::B64_BASE64_FLAG_NOCRLF);
BYTE* pbBase64Buffer = new BYTE[nBase64BufferLen]; BYTE* pbBase64Buffer = new BYTE[nBase64BufferLen];
#ifdef _IOS
if(true == Base64_1::Base64Encode(pbBinBuffer, nBinBufferLen, pbBase64Buffer, &nBase64BufferLen)) if(true == Base64_1::Base64Encode(pbBinBuffer, nBinBufferLen, pbBase64Buffer, &nBase64BufferLen))
#else
if(true == Base64::Base64Encode(pbBinBuffer, nBinBufferLen, (LPSTR)pbBase64Buffer, &nBase64BufferLen, Base64::B64_BASE64_FLAG_NOCRLF))
#endif
{ {
CFile oFile; CFile oFile;
oFile.CreateFile(sFileOutput); oFile.CreateFile(sFileOutput);
......
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