Skip to content

Commit 48403ef

Browse files
committed
Various fixes
1 parent ed5dae4 commit 48403ef

3 files changed

Lines changed: 19 additions & 3 deletions

File tree

appveyor.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ skip_non_tags: true
33
image: Visual Studio 2022
44
environment:
55
Qt5_INSTALL_DIR: C:\Qt\5.15.2\msvc2019
6-
Qt6_INSTALL_DIR: C:\Qt\6.9.1\msvc2022_64
6+
Qt6_INSTALL_DIR: C:\Qt\6.9.2\msvc2022_64
77
install:
88
- pip install aqtinstall
9-
- aqt install-qt windows desktop 6.9.1 win64_msvc2022_64 --outputdir C:\Qt
9+
- aqt install-qt windows desktop 6.9.2 win64_msvc2022_64 --outputdir C:\Qt
1010

1111
build_script:
1212
- ps: |

src/mainwindowimpl.cpp

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -413,7 +413,7 @@ void MainWindowImpl::loadFiles(QStringList fileNames)
413413
/* Controlla i doppioni! */
414414
if (!checkDuplicates(fileNames, i)) {
415415
Image my_image;
416-
my_image.quiet(true);
416+
//my_image.quiet(true);
417417

418418
try {
419419
my_image.ping(fileNames.at(i).toStdString());
@@ -441,6 +441,14 @@ void MainWindowImpl::loadFiles(QStringList fileNames)
441441
y_dpi_data = dpiY * 0.0254;
442442
}
443443
}
444+
catch( Magick::WarningCoder &warning )
445+
{
446+
qWarning() << "Read Warning: " << QString("Warning : %1").arg(QString::fromStdString(warning.what()));;
447+
}
448+
catch( Magick::Warning &warning )
449+
{
450+
qWarning() << "Read Warning: " << QString("Warning : %1").arg(QString::fromStdString(warning.what()));;
451+
}
444452

445453
iA.completeFileName = fileNames.at(i).toUtf8();
446454
iA.fileName = fi.fileName();

src/thumbnailgeneratorthread.cpp

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,14 @@ void ThumbnailGeneratorThread::createThumbnail()
137137
img_dens_x = qRound(dpiX * 0.0254);
138138
img_dens_y = qRound(dpiY * 0.0254);
139139
}
140+
catch( Magick::WarningCoder &warning )
141+
{
142+
qWarning() << "Read Warning: " << QString("Warning : %1").arg(QString::fromStdString(warning.what()));;
143+
}
144+
catch( Magick::Warning &warning )
145+
{
146+
qWarning() << "Read Warning: " << QString("Warning : %1").arg(QString::fromStdString(warning.what()));;
147+
}
140148

141149
if (m_generateThumbnail) {
142150
qreal scaleFactor = globals::Globals::scaleFactor();

0 commit comments

Comments
 (0)