Commit e726c50a authored by Oleg Korshul's avatar Oleg Korshul Committed by Alexander Trofimov

поправил с учетом новых интерфейсов

parent 7d321f25
...@@ -1766,20 +1766,20 @@ namespace NExtractTools ...@@ -1766,20 +1766,20 @@ namespace NExtractTools
if(AVS_OFFICESTUDIO_FILE_CROSSPLATFORM_PDF == nFormatFrom) if(AVS_OFFICESTUDIO_FILE_CROSSPLATFORM_PDF == nFormatFrom)
{ {
PdfReader::CPdfReader oReader(&oApplicationFonts); PdfReader::CPdfReader oReader(&oApplicationFonts);
oReader.SetTempFolder(sTemp.c_str()); oReader.SetTempDirectory(sTemp);
nRes = PdfDjvuXpsToRenderer<PdfReader::CPdfReader>(oReader, &pdfWriter, sFrom, nFormatFrom, sTo, sTemp, sFontPath); nRes = PdfDjvuXpsToRenderer<PdfReader::CPdfReader>(oReader, &pdfWriter, sFrom, nFormatFrom, sTo, sTemp, sFontPath);
pdfWriter.SaveToFile(sTo); pdfWriter.SaveToFile(sTo);
} }
else if(AVS_OFFICESTUDIO_FILE_CROSSPLATFORM_DJVU == nFormatFrom) else if(AVS_OFFICESTUDIO_FILE_CROSSPLATFORM_DJVU == nFormatFrom)
{ {
CDjVuFile oReader; CDjVuFile oReader(&oApplicationFonts);
nRes = PdfDjvuXpsToRenderer<CDjVuFile>(oReader, &pdfWriter, sFrom, nFormatFrom, sTo, sTemp, sFontPath); nRes = PdfDjvuXpsToRenderer<CDjVuFile>(oReader, &pdfWriter, sFrom, nFormatFrom, sTo, sTemp, sFontPath);
pdfWriter.SaveToFile(sTo); pdfWriter.SaveToFile(sTo);
} }
else if(AVS_OFFICESTUDIO_FILE_CROSSPLATFORM_XPS == nFormatFrom) else if(AVS_OFFICESTUDIO_FILE_CROSSPLATFORM_XPS == nFormatFrom)
{ {
CXpsFile oReader(&oApplicationFonts); CXpsFile oReader(&oApplicationFonts);
oReader.SetTempFolder(sTemp.c_str()); oReader.SetTempDirectory(sTemp);
nRes = PdfDjvuXpsToRenderer<CXpsFile>(oReader, &pdfWriter, sFrom, nFormatFrom, sTo, sTemp, sFontPath); nRes = PdfDjvuXpsToRenderer<CXpsFile>(oReader, &pdfWriter, sFrom, nFormatFrom, sTo, sTemp, sFontPath);
pdfWriter.SaveToFile(sTo); pdfWriter.SaveToFile(sTo);
} }
...@@ -1801,20 +1801,20 @@ namespace NExtractTools ...@@ -1801,20 +1801,20 @@ namespace NExtractTools
if(AVS_OFFICESTUDIO_FILE_CROSSPLATFORM_PDF == nFormatFrom) if(AVS_OFFICESTUDIO_FILE_CROSSPLATFORM_PDF == nFormatFrom)
{ {
PdfReader::CPdfReader oReader(&oApplicationFonts); PdfReader::CPdfReader oReader(&oApplicationFonts);
oReader.SetTempFolder(sTemp.c_str()); oReader.SetTempDirectory(sTemp);
nRes = PdfDjvuXpsToRenderer<PdfReader::CPdfReader>(oReader, &oHtmlRenderer, sFrom, nFormatFrom, sTo, sTemp, sFontPath); nRes = PdfDjvuXpsToRenderer<PdfReader::CPdfReader>(oReader, &oHtmlRenderer, sFrom, nFormatFrom, sTo, sTemp, sFontPath);
oHtmlRenderer.CloseFile(); oHtmlRenderer.CloseFile();
} }
else if(AVS_OFFICESTUDIO_FILE_CROSSPLATFORM_DJVU == nFormatFrom) else if(AVS_OFFICESTUDIO_FILE_CROSSPLATFORM_DJVU == nFormatFrom)
{ {
CDjVuFile oReader; CDjVuFile oReader(&oApplicationFonts);
nRes = PdfDjvuXpsToRenderer<CDjVuFile>(oReader, &oHtmlRenderer, sFrom, nFormatFrom, sTo, sTemp, sFontPath); nRes = PdfDjvuXpsToRenderer<CDjVuFile>(oReader, &oHtmlRenderer, sFrom, nFormatFrom, sTo, sTemp, sFontPath);
oHtmlRenderer.CloseFile(); oHtmlRenderer.CloseFile();
} }
else if(AVS_OFFICESTUDIO_FILE_CROSSPLATFORM_XPS == nFormatFrom) else if(AVS_OFFICESTUDIO_FILE_CROSSPLATFORM_XPS == nFormatFrom)
{ {
CXpsFile oReader(&oApplicationFonts); CXpsFile oReader(&oApplicationFonts);
oReader.SetTempFolder(sTemp.c_str()); oReader.SetTempDirectory(sTemp);
nRes = PdfDjvuXpsToRenderer<CXpsFile>(oReader, &oHtmlRenderer, sFrom, nFormatFrom, sTo, sTemp, sFontPath); nRes = PdfDjvuXpsToRenderer<CXpsFile>(oReader, &oHtmlRenderer, sFrom, nFormatFrom, sTo, sTemp, sFontPath);
oHtmlRenderer.CloseFile(); oHtmlRenderer.CloseFile();
} }
......
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