pengjunjie/core
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/core.git synced 2026-04-07 13:55:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

normal image size

Browse Source
This commit is contained in:
Svetlana Kulikova
2020-07-16 12:34:29 +03:00
parent a9f5eeca1a
commit f78fe7db45
1 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Fb2File/Fb2File.cpp
View File

@ -271,10 +271,12 @@ public:
// Получаем размеры картинки // Получаем размеры картинки
CBgraFrame oBgraFrame; CBgraFrame oBgraFrame;
oBgraFrame.OpenFile(sMediaDirectory + L"/" + sId); oBgraFrame.OpenFile(sMediaDirectory + L"/" + sId);
unsigned int nX = 4000000;
unsigned int nY = oBgraFrame.get_Height() * nX / oBgraFrame.get_Width();
std::vector<std::wstring> vImage; std::vector<std::wstring> vImage;
vImage.push_back(L"rPic" + sImageId); vImage.push_back(L"rPic" + sImageId);
vImage.push_back(std::to_wstring(oBgraFrame.get_Width())); vImage.push_back(std::to_wstring(nX));
vImage.push_back(std::to_wstring(oBgraFrame.get_Height())); vImage.push_back(std::to_wstring(nY));
m_mImages.insert(std::make_pair(sId, vImage)); m_mImages.insert(std::make_pair(sId, vImage));
// Запись картинок в рельсы // Запись картинок в рельсы
@ -863,6 +865,18 @@ public:
// Читаем body // Читаем body
if(m_oLightReader.GetName() == L"body") if(m_oLightReader.GetName() == L"body")
{ {
// Пропускаем сноски
bool bNotes = false;
while(m_oLightReader.MoveToNextAttribute())
{
if(m_oLightReader.GetName() == L"name" &&
m_oLightReader.GetText() == L"notes")
bNotes = true;
}
m_oLightReader.MoveToElement();
if(bNotes)
continue;
int nBDeath = m_oLightReader.GetDepth(); int nBDeath = m_oLightReader.GetDepth();
while(m_oLightReader.ReadNextSiblingNode(nBDeath)) while(m_oLightReader.ReadNextSiblingNode(nBDeath))
{ {