From 661a3c164387865f699391e24454d1c8751bbb45 Mon Sep 17 00:00:00 2001 From: Herwig Birke Date: Tue, 28 Mar 2023 09:47:16 +0200 Subject: [PATCH] migrate --- cexif.cpp | 10 +++++++--- cmainwindow.cpp | 2 +- pictureConvert.pro | 4 ++-- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/cexif.cpp b/cexif.cpp index c11a812..f1fec87 100644 --- a/cexif.cpp +++ b/cexif.cpp @@ -15,6 +15,8 @@ #include #include +#include "cimage.h" + #include @@ -44,7 +46,8 @@ bool cEXIF::fromFile(const QString& szFileName) try { - Exiv2::Image::UniquePtr image = Exiv2::ImageFactory::open(szFileName.toLocal8Bit().toStdString()); +// Exiv2::Image::UniquePtr image = Exiv2::ImageFactory::open(szFileName.toLocal8Bit().toStdString()); + Exiv2::Image::AutoPtr image = Exiv2::ImageFactory::open(szFileName.toLocal8Bit().toStdString()); if(!image.get()) return(false); @@ -154,7 +157,7 @@ bool cEXIF::fromFile(const QString& szFileName) if(!m_previewList.count()) { - QImage image; + cImage image; if(image.load(szFileName)) { QTransform rotation; @@ -501,7 +504,8 @@ bool cEXIF::copyTo(const QString& fileName) { try { - Exiv2::Image::UniquePtr image = Exiv2::ImageFactory::open(fileName.toLocal8Bit().toStdString()); +// Exiv2::Image::UniquePtr image = Exiv2::ImageFactory::open(fileName.toLocal8Bit().toStdString()); + Exiv2::Image::AutoPtr image = Exiv2::ImageFactory::open(fileName.toLocal8Bit().toStdString()); if(!image.get()) return(false); diff --git a/cmainwindow.cpp b/cmainwindow.cpp index eda8936..66d1a38 100644 --- a/cmainwindow.cpp +++ b/cmainwindow.cpp @@ -333,7 +333,7 @@ void cMainWindow::onAddEntrys(const QStringList& fileList) { QMimeType mimeType = m_mimeDB.mimeTypeForFile(file); - if(mimeType.name().startsWith("image")) + if(mimeType.name().startsWith("image") || !fileInfo.suffix().compare("cr3", Qt::CaseInsensitive)) addFile(file); } if(m_stopIt) diff --git a/pictureConvert.pro b/pictureConvert.pro index 36c0baf..54c91b2 100644 --- a/pictureConvert.pro +++ b/pictureConvert.pro @@ -20,8 +20,8 @@ win32-msvc* { win32-g++ { message("mingw") - INCLUDEPATH += C:\dev\3rdParty\exiv2\include C:\dev\3rdParty\libraw C:\dev\3rdParty\libjpeg\include C:\dev\3rdParty\opencv\include dng - LIBS += -LC:\dev\3rdParty\exiv2\lib -lexiv2.dll -LC:\dev\3rdParty\libraw\lib -LC:\dev\3rdParty\opencv\x64\mingw\lib -lraw -lws2_32 -lz -lopencv_core412.dll -lopencv_imgproc412.dll + INCLUDEPATH += C:\dev\3rdParty\exiv2-0.27.5\include C:\dev\3rdParty\libraw C:\dev\3rdParty\libjpeg\include C:\dev\3rdParty\opencv\include dng + LIBS += -LC:\dev\3rdParty\exiv2-0.27.5\lib -lexiv2.dll -LC:\dev\3rdParty\libraw\lib -LC:\dev\3rdParty\opencv\x64\mingw\lib -lraw -lws2_32 -lz -lopencv_core412.dll -lopencv_imgproc412.dll } unix {