Update ASCConverters.cpp

add bin2imageBase64 to generate thumbnail from pdf command in base64 format

X2tConverter/src/ASCConverters.cpp

@@ -75,6 +75,26 @@ namespace NExtractTools
             oApplicationFonts.Initialize();
         else
             oApplicationFonts.InitializeFromFolder(sFontPath);
+    }
+	std::wstring getExtentionByRasterFormat(int format)
+	{
+		std::wstring sExt;
+		switch(format)
+		{
+			case 1:
+				sExt = L".bmp";
+			break;
+			case 2:
+				sExt = L".gif";
+			break;
+			case 3:
+				sExt = L".jpg";
+			break;
+			default:
+				sExt = L".png";
+			break;
+		}
+		return sExt;
 	}
 	// docx -> bin
     int docx2doct_bin (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params)
@@ -665,10 +685,9 @@ namespace NExtractTools
        int nReg = (bPaid == false) ? 0 : 1;
        return S_OK == pdfWriter.OnlineWordToPdf(sFrom, sTo) ? 0 : AVS_FILEUTILS_ERROR_CONVERT;
    }
-	int bin2image (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, const std::wstring &sThemeDir, InputParams& params)
+	int bin2image (const std::wstring &sTFileDir, BYTE* pBuffer, LONG lBufferLen, const std::wstring &sTo, const std::wstring &sTemp, const std::wstring &sThemeDir, InputParams& params)
 	{
 		long nRes = 0;
-		std::wstring sTFileDir = NSDirectory::GetFolderPath(sFrom);
 		CApplicationFonts oApplicationFonts;
 		initApplicationFonts(oApplicationFonts, params);
 		NSOnlineOfficeBinToPdf::CMetafileToRenderterRaster imageWriter(NULL);
@@ -711,10 +730,7 @@ namespace NExtractTools
 			NSDirectory::CreateDirectory(sThumbnailDir);
 			imageWriter.m_sFileName = sThumbnailDir + FILE_SEPARATOR_STR + L"image" + getExtentionByRasterFormat(imageWriter.m_nRasterFormat);
 		}
-		BYTE* pData;
-		DWORD nBytesCount;
-		NSFile::CFileBinary::ReadAllBytes(sFrom, &pData, nBytesCount);
-		nRes = imageWriter.ConvertBuffer(pData, nBytesCount) ? nRes : AVS_FILEUTILS_ERROR_CONVERT;
+		nRes = imageWriter.ConvertBuffer(pBuffer, lBufferLen) ? nRes : AVS_FILEUTILS_ERROR_CONVERT;
 		if(!imageWriter.m_bIsOnlyFirst)
 		{
 			COfficeUtils oCOfficeUtils(NULL);
@@ -722,6 +738,48 @@ namespace NExtractTools
 		}
 		return nRes;
 	}
+	int bin2imageBase64 (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, const std::wstring &sThemeDir, InputParams& params)
+	{
+		long nRes = 0;
+		NSFile::CFileBinary oFile;
+		if (!oFile.OpenFile(sFrom))
+			return AVS_FILEUTILS_ERROR_CONVERT;
+
+		DWORD dwFileSize = oFile.GetFileSize();
+		BYTE* pFileContent = new BYTE[dwFileSize];
+		if (!pFileContent)
+		{
+			oFile.CloseFile();
+			return AVS_FILEUTILS_ERROR_CONVERT;
+		}
+
+		DWORD dwReaded;
+		oFile.ReadFile(pFileContent, dwFileSize, dwReaded);
+		oFile.CloseFile();
+
+		int   nBufferLen = NSBase64::Base64DecodeGetRequiredLength(dwFileSize);
+		BYTE* pBuffer    = new BYTE[nBufferLen];
+		if (!pBuffer)
+		{
+			RELEASEARRAYOBJECTS(pFileContent);
+			return AVS_FILEUTILS_ERROR_CONVERT;
+		}
+
+		if (NSBase64::Base64Decode((const char*)pFileContent, dwFileSize, pBuffer, &nBufferLen))
+		{
+			std::wstring sTFileDir = NSDirectory::GetFolderPath(sFrom);
+			nRes = bin2image(sTFileDir, pBuffer, nBufferLen, sTo, sTemp, sThemeDir, params);
+		}
+		else
+		{
+			nRes = AVS_FILEUTILS_ERROR_CONVERT;
+		}
+
+		RELEASEARRAYOBJECTS(pBuffer);
+		RELEASEARRAYOBJECTS(pFileContent);
+
+		return nRes;
+	}
    //doct_bin -> pdf
    int doct_bin2pdf(NSDoctRenderer::DoctRendererFormat::FormatFile eFromType, const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, bool bPaid, const std::wstring &sThemeDir, InputParams& params)
    {
@@ -754,26 +812,7 @@ namespace NExtractTools
            NSFile::CFileBinary::Remove(sPdfBinFile);
        return nRes;
    }
-	std::wstring getExtentionByRasterFormat(int format)
-	{
-		std::wstring sExt;
-		switch(format)
-		{
-			case 1:
-				sExt = L".bmp";
-			break;
-			case 2:
-				sExt = L".gif";
-			break;
-			case 3:
-				sExt = L".jpg";
-			break;
-			default:
-				sExt = L".png";
-			break;
-		}
-		return sExt;
-	}
+
 	//doct_bin -> image
 	int doct_bin2image(NSDoctRenderer::DoctRendererFormat::FormatFile eFromType, const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, bool bPaid, const std::wstring &sThemeDir, InputParams& params)
 	{
@@ -793,7 +832,17 @@ namespace NExtractTools
 		}
 		else
 		{
-			nRes = 0 == bin2image(sPdfBinFile, sTo, sTemp, sThemeDir, params) ? nRes : AVS_FILEUTILS_ERROR_CONVERT;
+			BYTE* pData = NULL;
+			DWORD nBytesCount;
+			if (NSFile::CFileBinary::ReadAllBytes(sPdfBinFile, &pData, nBytesCount))
+			{
+				nRes = 0 == bin2image(sTFileDir, pData, nBytesCount, sTo, sTemp, sThemeDir, params) ? nRes : AVS_FILEUTILS_ERROR_CONVERT;
+				RELEASEARRAYOBJECTS(pData);
+			}
+			else
+			{
+				nRes = AVS_FILEUTILS_ERROR_CONVERT;
+			}
 		}
 		//delete sPdfBinFile, because it is not in Temp
 		if (NSFile::CFileBinary::Exists(sPdfBinFile))
@@ -2381,7 +2430,7 @@ namespace NExtractTools
        }
        else if(0 != (AVS_OFFICESTUDIO_FILE_IMAGE & nFormatTo))
        {
-           nRes = bin2image(sFrom, sTo, sTemp, sThemeDir, params);
+           nRes = bin2imageBase64(sFrom, sTo, sTemp, sThemeDir, params);
        }
        else
        {