diff --git a/Test/Applications/StandardTester/main.cpp b/Test/Applications/StandardTester/main.cpp index d8bc412974..8d8d2d9a0a 100644 --- a/Test/Applications/StandardTester/main.cpp +++ b/Test/Applications/StandardTester/main.cpp @@ -94,6 +94,10 @@ public: m_formats.insert(std::make_pair(AVS_OFFICESTUDIO_FILE_SPREADSHEET_ODS, true)); m_formats.insert(std::make_pair(AVS_OFFICESTUDIO_FILE_SPREADSHEET_CSV, true)); + m_formats.insert(std::make_pair(AVS_OFFICESTUDIO_FILE_CROSSPLATFORM_PDF, true)); + m_formats.insert(std::make_pair(AVS_OFFICESTUDIO_FILE_CROSSPLATFORM_XPS, true)); + m_formats.insert(std::make_pair(AVS_OFFICESTUDIO_FILE_CROSSPLATFORM_DJVU, true)); + m_nCount = 0; m_nCurrent = 0; m_nCurrentComplete = 0; @@ -125,8 +129,9 @@ public: std::wstring sExt = NSFile::GetFileExtention(*iter); if (sExt == L"docx" || sExt == L"doc" || sExt == L"odt" || sExt == L"rtf" || sExt == L"docxf" || sExt == L"oform" || - sExt == L"pptx" || sExt == L"ppt" || sExt == L"odp" || - sExt == L"xlsx" || sExt == L"xls" || sExt == L"ods") + sExt == L"pptx" || sExt == L"ppt" || sExt == L"odp" || + sExt == L"xlsx" || sExt == L"xls" || sExt == L"ods" || + sExt == L"pdf" || sExt == L"xps" || sExt == L"djvu") { m_files.push_back(*iter); } diff --git a/X2tConverter/src/ASCConverters.cpp b/X2tConverter/src/ASCConverters.cpp index 1266847441..312ae8240d 100644 --- a/X2tConverter/src/ASCConverters.cpp +++ b/X2tConverter/src/ASCConverters.cpp @@ -3754,6 +3754,11 @@ namespace NExtractTools nRasterWCur = (int)(dWidth * dKoef1 + 0.5); nRasterHCur = (int)(dHeight * dKoef1 + 0.5); } + else if (2 == nSaveType) + { + nRasterWCur = -1; + nRasterHCur = -1; + } std::wstring sFileTo; if (bIsOnlyFirst) {