birkeh/pictureConvert
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

migrate

Browse Source
This commit is contained in:
Herwig Birke
2023-03-28 09:47:16 +02:00
parent 6e2d8f717d
commit 661a3c1643
3 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cexif.cpp
+7 -3
View File
@@ -15,6 +15,8 @@
#include <QSqlDatabase>
#include <QSqlQuery>
#include "cimage.h"
#include <exiv2/exiv2.hpp>
@@ -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);
cmainwindow.cpp
+1 -1
View File
@@ -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)
pictureConvert.pro
+2 -2
View File
@@ -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 {