Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-10-16 15:41:13 +02:00
Code Issues Projects Releases Wiki Activity

2022-11-10 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Added code to catch warning exception when processing image
	conversions in 'RDIMResizeImage()'.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason
2022-11-10 17:36:19 -05:00
parent b5e05a0563
commit 030bc6acae
5 changed files with 50 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/rdfeed.cpp
View File

@@ -771,6 +771,8 @@ int RDFeed::importImageFile(const QString &pathname,QString *err_msg,
//
// Write it to the DB
//
QString im_err;
QStringList f0=pathname.split(".",QString::SkipEmptyParts);
sql=QString("insert into `FEED_IMAGES` set ")+
QString::asprintf("`FEED_ID`=%u,",id())+
@@ -782,9 +784,9 @@ int RDFeed::importImageFile(const QString &pathname,QString *err_msg,
"`FILE_EXTENSION`='"+RDEscapeString(f0.last().toLower())+"',"+
"`DATA`="+RDEscapeBlob(data)+","+
"`DATA_MID_THUMB`="+
RDEscapeBlob(RDIMResizeImage(data,RD_MID_THUMB_SIZE))+","+
RDEscapeBlob(RDIMResizeImage(data,RD_MID_THUMB_SIZE,&im_err))+","+
"`DATA_SMALL_THUMB`="+
RDEscapeBlob(RDIMResizeImage(data,RD_SMALL_THUMB_SIZE));
RDEscapeBlob(RDIMResizeImage(data,RD_SMALL_THUMB_SIZE,&im_err));
ret=RDSqlQuery::run(sql,&ok).toInt();
if(!ok) {
*err_msg="Unable to write images to database";

21
lib/rdimagemagick.cpp
View File

@@ -18,18 +18,29 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//
#include <QString>
#include <Magick++.h>
#include "rdimagemagick.h"
QByteArray RDIMResizeImage(const QByteArray &src_image,const QSize &size)
QByteArray RDIMResizeImage(const QByteArray &src_image,const QSize &size,
QString *err_msg)
{
Magick::Image img(Magick::Blob(src_image.constData(),src_image.size()));
Magick::Geometry dst_size(size.width(),size.height());
Magick::Blob dst_blob;
*err_msg="";
try {
Magick::Image img(Magick::Blob(src_image.constData(),src_image.size()));
Magick::Geometry dst_size(size.width(),size.height());
img.zoom(Magick::Geometry(size.width(),size.height()));
img.write(&dst_blob);
img.zoom(Magick::Geometry(size.width(),size.height()));
img.write(&dst_blob);
}
catch (Magick::WarningCoder &warn) {
*err_msg=QString::fromUtf8(warn.what());
fprintf(stderr,"Magick: %s\n",warn.what());
}
return QByteArray((const char *)dst_blob.data(),dst_blob.length());
}

3
lib/rdimagemagick.h
View File

@@ -24,7 +24,8 @@
#include <QByteArray>
#include <QSize>
QByteArray RDIMResizeImage(const QByteArray &src_image,const QSize &size);
QByteArray RDIMResizeImage(const QByteArray &src_image,const QSize &size,
QString *err_msg);
#endif // RDIMAGEMAGICK_H