lmh188
/
code_app
mirror of http://192.168.10.5:8099/sane/code_app.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

取消屏蔽pdf特殊处理，调整pdf图像宽高信息

This commit is contained in:
yangjiaxuan 2022-08-23 12:42:01 +08:00
parent 37602926de
commit b06d4de191
2 changed files with 63 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
app/scanner/dialog_fullscreen.cpp
View File

@ -71,23 +71,23 @@ void Dialog_FullScreen::showImage()
HGImage img = nullptr;
// HGPdfReader pdfReader = nullptr;
// HGImgFmt_OpenPdfReader(getStdString(m_currFilePath).c_str(), &pdfReader);
// if (nullptr != pdfReader)
// {
// HGPdfPageInfo pageInfo = {0, 0};
// if (HGBASE_ERR_OK == HGImgFmt_GetPdfPageInfo(pdfReader, (HGUInt)m_multiIndex, &pageInfo))
// {
// float scale = 1.0f;
// if (pageInfo.width < 1600)
// scale = 1600.0f / pageInfo.width;
// HGImgFmt_LoadImageFromPdfReader(pdfReader, (HGUInt)m_multiIndex, scale, scale, 0, HGBASE_IMGORIGIN_TOP, &img);
// }
HGPdfReader pdfReader = nullptr;
HGImgFmt_OpenPdfReader(getStdString(m_currFilePath).c_str(), &pdfReader);
if (nullptr != pdfReader)
{
HGPdfPageInfo pageInfo = {0, 0};
if (HGBASE_ERR_OK == HGImgFmt_GetPdfPageInfo(pdfReader, (HGUInt)m_multiIndex, &pageInfo))
{
float scale = 1.0f;
if (pageInfo.width < 1600)
scale = 1600.0f / pageInfo.width;
HGImgFmt_LoadImageFromPdfReader(pdfReader, (HGUInt)m_multiIndex, scale, scale, 0, HGBASE_IMGORIGIN_TOP, &img);
}
// HGImgFmt_ClosePdfReader(pdfReader);
// }
// else
// {
HGImgFmt_ClosePdfReader(pdfReader);
}
else
{
HGImgFmtReader imgFmtReader = nullptr;
HGImgFmt_OpenImageReader(getStdString(m_currFilePath).c_str(), 0, &imgFmtReader);
if (nullptr != imgFmtReader)
@ -95,7 +95,7 @@ void Dialog_FullScreen::showImage()
HGImgFmt_LoadImageFromReader(imgFmtReader, (HGUInt)m_multiIndex, nullptr, 0, HGBASE_IMGORIGIN_TOP, &img);
HGImgFmt_CloseImageReader(imgFmtReader);
}
// }
}
if (nullptr != img)
{

58
app/scanner/mainwindow.cpp
View File

@ -1342,24 +1342,24 @@ HGImage MainWindow::createImage()
HGImage img = nullptr;
// HGPdfReader pdfReader = nullptr;
// HGImgFmt_OpenPdfReader(getStdString(m_currFilePath).c_str(), &pdfReader);
// if (nullptr != pdfReader)
// {
// HGPdfPageInfo pageInfo = {0, 0};
// if (HGBASE_ERR_OK == HGImgFmt_GetPdfPageInfo(pdfReader, (HGUInt)m_multiIndex, &pageInfo))
// {
// float scale = 1.0f;
// if (pageInfo.width < 1600)
// scale = 1600.0f / pageInfo.width;
HGPdfReader pdfReader = nullptr;
HGImgFmt_OpenPdfReader(getStdString(m_currFilePath).c_str(), &pdfReader);
if (nullptr != pdfReader)
{
HGPdfPageInfo pageInfo = {0, 0};
if (HGBASE_ERR_OK == HGImgFmt_GetPdfPageInfo(pdfReader, (HGUInt)m_multiIndex, &pageInfo))
{
float scale = 1.0f;
if (pageInfo.width < 1600)
scale = 1600.0f / pageInfo.width;
// HGImgFmt_LoadImageFromPdfReader(pdfReader, (HGUInt)m_multiIndex, scale, scale, 0, HGBASE_IMGORIGIN_TOP, &img);
// }
HGImgFmt_LoadImageFromPdfReader(pdfReader, (HGUInt)m_multiIndex, scale, scale, 0, HGBASE_IMGORIGIN_TOP, &img);
}
// HGImgFmt_ClosePdfReader(pdfReader);
// }
// else
// {
HGImgFmt_ClosePdfReader(pdfReader);
}
else
{
HGImgFmtReader imgFmtReader = nullptr;
HGImgFmt_OpenImageReader(getStdString(m_currFilePath).c_str(), 0, &imgFmtReader);
if (nullptr != imgFmtReader)
@ -1367,7 +1367,7 @@ HGImage MainWindow::createImage()
HGImgFmt_LoadImageFromReader(imgFmtReader, (HGUInt)m_multiIndex, nullptr, 0, HGBASE_IMGORIGIN_TOP, &img);
HGImgFmt_CloseImageReader(imgFmtReader);
}
// }
}
return img;
}
@ -2166,6 +2166,29 @@ void MainWindow::on_act_imageInfo_triggered()
HGImgFmtLoadInfo imgInfo;
memset(&imgInfo, 0, sizeof(HGImgFmtLoadInfo));
HGPdfReader pdfReader = nullptr;
HGImgFmt_OpenPdfReader(m_currFilePath.toStdString().c_str(), &pdfReader);
if (nullptr != pdfReader)
{
HGPdfPageInfo pageInfo = {0, 0};
HGImgFmt_GetPdfPageInfo(pdfReader, 0, &pageInfo);
HGUInt width = pageInfo.width;
HGUInt height = pageInfo.height;
if (width < 1600)
{
width = 1600;
height = pageInfo.height * width / pageInfo.width;
}
imgInfo.width = width;
imgInfo.height = height;
HGImgFmt_ClosePdfReader(pdfReader);
}
else
{
HGImgFmtReader imgFmtReader = nullptr;
HGImgFmt_OpenImageReader(getStdString(m_currFilePath).c_str(), 0, &imgFmtReader);
if (nullptr != imgFmtReader)
@ -2173,6 +2196,7 @@ void MainWindow::on_act_imageInfo_triggered()
HGImgFmt_LoadImageFromReader(imgFmtReader, (HGUInt)m_multiIndex, &imgInfo, 0, 0, nullptr);
HGImgFmt_CloseImageReader(imgFmtReader);
}
}
QStringList fileKeys;
fileKeys << tr("File name") << tr("File path") << tr("File size") << tr("Creation date/time") << tr("Modified date/time") << tr("Accessed date/time");