[poppler] qt6/src

[GitLab Mirror]

 qt6/src/poppler-annotation.cc |    6 ------
 1 file changed, 6 deletions(-)

New commits:
commit a246536f330eb6151a63cb1e86c6e0a7398fff64
Author: Albert Astals Cid <aacid at kde.org>
Date:   Mon Oct 11 23:19:18 2021 +0200

    qt6: remove useless ifdef

diff --git a/qt6/src/poppler-annotation.cc b/qt6/src/poppler-annotation.cc
index 5c9df939..40c992ab 100644
--- a/qt6/src/poppler-annotation.cc
+++ b/qt6/src/poppler-annotation.cc
@@ -104,11 +104,7 @@ void getRawDataFromQImage(const QImage &qimg, int bitsPerPixel, QByteArray *data
         break;
     case 8:
     case 24:
-#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
         data->append((const char *)qimg.bits(), static_cast<int>(qimg.sizeInBytes()));
-#else
-        data->append((const char *)qimg.bits(), qimg.byteCount());
-#endif
         break;
     case 32:
         for (int line = 0; line < height; line++) {
@@ -2687,14 +2683,12 @@ AnnotStampImageHelper *StampAnnotationPrivate::convertQImageToAnnotStampImageHel
     case QImage::Format_Grayscale8:
         bitsPerComponent = 8;
         break;
-#if QT_VERSION >= QT_VERSION_CHECK(5, 13, 0)
     case QImage::Format_Grayscale16:
         convertedQImage = convertedQImage.convertToFormat(QImage::Format_Grayscale8);
 
         colorSpace = ColorSpace::DeviceGray;
         bitsPerComponent = 8;
         break;
-#endif
     case QImage::Format_RGB16:
     case QImage::Format_RGB666:
     case QImage::Format_RGB555: