pengjunjie/core
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/core.git synced 2026-07-20 06:24:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix bug #63535

Browse Source
This commit is contained in:
Elena.Subbotina
2023-08-07 17:50:43 +03:00
parent a0e1760e94
commit 19f28facf6
4 changed files with 28 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
DesktopEditor/raster/ImageFileFormatChecker.cpp
View File

@ -440,93 +440,92 @@ bool CImageFileFormatChecker::isImageFile(std::wstring& fileName)
{
eFileType = _CXIMAGE_FORMAT_GIF;
}
if (isPngFile(buffer,sizeRead))
else if (isPngFile(buffer,sizeRead))
{
eFileType = _CXIMAGE_FORMAT_PNG;
}
if (isTgaFile(buffer,sizeRead))
else if (isTgaFile(buffer,sizeRead))
{
eFileType = _CXIMAGE_FORMAT_TGA;
}
if (isPcxFile(buffer,sizeRead))
else if (isPcxFile(buffer,sizeRead))
{
eFileType = _CXIMAGE_FORMAT_PCX;
}
if (isJpgFile(buffer,sizeRead))
else if (isJpgFile(buffer,sizeRead))
{
eFileType = _CXIMAGE_FORMAT_JPG;
}
if (isEmfFile(buffer,sizeRead))
else if (isEmfFile(buffer,sizeRead))
{
eFileType = _CXIMAGE_FORMAT_EMF;
}
if (isWmfFile(buffer,sizeRead))
else if (isWmfFile(buffer,sizeRead))
{
eFileType = _CXIMAGE_FORMAT_WMF;
}
if (isTiffFile(buffer,sizeRead))
else if (isTiffFile(buffer,sizeRead))
{
eFileType = _CXIMAGE_FORMAT_TIF;
}
if (isIcoFile(buffer,sizeRead))
else if (isIcoFile(buffer,sizeRead))
{
eFileType = _CXIMAGE_FORMAT_ICO;
}
if (isWbFile(buffer,sizeRead))
else if (isWbFile(buffer,sizeRead))
{
eFileType = _CXIMAGE_FORMAT_WB;
}
if (isPsdFile(buffer,sizeRead))
else if (isPsdFile(buffer,sizeRead))
{
eFileType = _CXIMAGE_FORMAT_PSD;
}
if (isRasFile(buffer,sizeRead))
else if (isRasFile(buffer,sizeRead))
{
eFileType = _CXIMAGE_FORMAT_RAS;
}
if (isIpodFile(buffer,sizeRead))
else if (isIpodFile(buffer,sizeRead))
{
eFileType = _CXIMAGE_FORMAT_UNKNOWN;
}
if (isJ2kFile(buffer,sizeRead))
else if (isJ2kFile(buffer,sizeRead))
{
eFileType = _CXIMAGE_FORMAT_JP2;
}
if (isJp2File(buffer,sizeRead))
else if (isJp2File(buffer,sizeRead))
{
eFileType = _CXIMAGE_FORMAT_JP2;
}
if (isMj2File(buffer,sizeRead))
else if (isMj2File(buffer,sizeRead))
{
eFileType = _CXIMAGE_FORMAT_JP2;
}
if (isSfwFile(buffer,sizeRead))
else if (isSfwFile(buffer,sizeRead))
{
eFileType = _CXIMAGE_FORMAT_UNKNOWN;
}
if (isSvmFile(buffer,sizeRead))
else if (isSvmFile(buffer,sizeRead))
{
eFileType = _CXIMAGE_FORMAT_UNKNOWN;
}
if (isSwfFile(buffer,sizeRead))
else if (isSwfFile(buffer,sizeRead))
{
eFileType = _CXIMAGE_FORMAT_UNKNOWN;
}
if (isWbcFile(buffer,sizeRead))
else if (isWbcFile(buffer,sizeRead))
{
eFileType = _CXIMAGE_FORMAT_UNKNOWN;
}
if (isWbzFile(buffer,sizeRead))
else if (isWbzFile(buffer,sizeRead))
{
eFileType = _CXIMAGE_FORMAT_UNKNOWN;
}
///////////////////////////////////////////////////////////////////////
if (isSvgFile(fileName))
//----------------------------------------------------------------
else if (isSvgFile(fileName))
{
eFileType = _CXIMAGE_FORMAT_SVG;
}
if (isRawFile(fileName))
else if (isRawFile(fileName))
{
eFileType = _CXIMAGE_FORMAT_UNKNOWN;
}