factorize

htmlexport/imagegenerationfunctor.cpp

@@ -64,8 +64,8 @@ namespace KIPIHTMLExport
  */
 static QImage generateThumbnail(const QImage& fullImage, int size, bool square)
 {
-    QImage image = fullImage.scaled(size, size,
-        square ? Qt::KeepAspectRatioByExpanding : Qt::KeepAspectRatio,
+    QImage image = fullImage.scaled(size, size, square ? Qt::KeepAspectRatioByExpanding
+                                                       : Qt::KeepAspectRatio,
                                     Qt::SmoothTransformation);
 
     if (square && (image.width() != size || image.height() != size))
@@ -100,14 +100,11 @@ void ImageGenerationFunctor::operator()(ImageElement& element)
     }
 
     QImage     originalImage;
-
-    // Check if RAW file.
-    QFileInfo fi(path);
-    QString rawFilesExt(KDcraw::rawFiles());
     QString    imageFormat;
     QByteArray imageData;
 
-    if (rawFilesExt.toUpper().contains(fi.suffix().toUpper()) && !mInfo->useOriginalImageAsFullImage())
+    // Check if RAW file.
+    if (KPMetadata::isRawFile(path))
     {
         if (!KDcraw::loadDcrawPreview(originalImage, path))
         {