diff options
Diffstat (limited to 'src/plugins/imageformats')
-rw-r--r-- | src/plugins/imageformats/gif/.prev_CMakeLists.txt | 7 | ||||
-rw-r--r-- | src/plugins/imageformats/gif/CMakeLists.txt | 7 | ||||
-rw-r--r-- | src/plugins/imageformats/gif/main.cpp | 2 | ||||
-rw-r--r-- | src/plugins/imageformats/gif/qgifhandler.cpp | 12 | ||||
-rw-r--r-- | src/plugins/imageformats/ico/.prev_CMakeLists.txt | 7 | ||||
-rw-r--r-- | src/plugins/imageformats/ico/CMakeLists.txt | 10 | ||||
-rw-r--r-- | src/plugins/imageformats/ico/main.cpp | 4 | ||||
-rw-r--r-- | src/plugins/imageformats/ico/qicohandler.cpp | 13 | ||||
-rw-r--r-- | src/plugins/imageformats/jpeg/.prev_CMakeLists.txt | 12 | ||||
-rw-r--r-- | src/plugins/imageformats/jpeg/CMakeLists.txt | 12 | ||||
-rw-r--r-- | src/plugins/imageformats/jpeg/main.cpp | 4 | ||||
-rw-r--r-- | src/plugins/imageformats/jpeg/qjpeghandler.cpp | 8 |
12 files changed, 40 insertions, 58 deletions
diff --git a/src/plugins/imageformats/gif/.prev_CMakeLists.txt b/src/plugins/imageformats/gif/.prev_CMakeLists.txt index c4add000b2..b4923b81b1 100644 --- a/src/plugins/imageformats/gif/.prev_CMakeLists.txt +++ b/src/plugins/imageformats/gif/.prev_CMakeLists.txt @@ -1,12 +1,12 @@ # Generated from gif.pro. ##################################################################### -## qgif Plugin: +## QGifPlugin Plugin: ##################################################################### -add_qt_plugin(qgif +qt_add_plugin(QGifPlugin + OUTPUT_NAME qgif TYPE imageformats - CLASS_NAME QGifPlugin SOURCES main.cpp main.h qgifhandler.cpp qgifhandler_p.h @@ -17,4 +17,3 @@ add_qt_plugin(qgif #### Keys ignored in scope 1:.:.:gif.pro:<TRUE>: # OTHER_FILES = "gif.json" -# _LOADED = "qt_plugin" diff --git a/src/plugins/imageformats/gif/CMakeLists.txt b/src/plugins/imageformats/gif/CMakeLists.txt index f9d90c6825..c6780e32e9 100644 --- a/src/plugins/imageformats/gif/CMakeLists.txt +++ b/src/plugins/imageformats/gif/CMakeLists.txt @@ -1,12 +1,12 @@ # Generated from gif.pro. ##################################################################### -## qgif Plugin: +## QGifPlugin Plugin: ##################################################################### -add_qt_plugin(qgif +qt_add_plugin(QGifPlugin + OUTPUT_NAME qgif TYPE imageformats - CLASS_NAME QGifPlugin SOURCES main.cpp main.h qgifhandler.cpp qgifhandler_p.h @@ -18,4 +18,3 @@ add_qt_plugin(qgif #### Keys ignored in scope 1:.:.:gif.pro:<TRUE>: # OTHER_FILES = "gif.json" -# _LOADED = "qt_plugin" diff --git a/src/plugins/imageformats/gif/main.cpp b/src/plugins/imageformats/gif/main.cpp index c171111fac..993871420c 100644 --- a/src/plugins/imageformats/gif/main.cpp +++ b/src/plugins/imageformats/gif/main.cpp @@ -62,7 +62,7 @@ QImageIOPlugin::Capabilities QGifPlugin::capabilities(QIODevice *device, const Q { if (format == "gif" || (device && device->isReadable() && QGifHandler::canRead(device))) return Capabilities(CanRead); - return 0; + return { }; } QImageIOHandler *QGifPlugin::create(QIODevice *device, const QByteArray &format) const diff --git a/src/plugins/imageformats/gif/qgifhandler.cpp b/src/plugins/imageformats/gif/qgifhandler.cpp index a6029b691c..c92cc3ea61 100644 --- a/src/plugins/imageformats/gif/qgifhandler.cpp +++ b/src/plugins/imageformats/gif/qgifhandler.cpp @@ -147,8 +147,8 @@ private: */ QGIFFormat::QGIFFormat() { - globalcmap = 0; - localcmap = 0; + globalcmap = nullptr; + localcmap = nullptr; lncols = 0; gncols = 0; disposal = NoDisposal; @@ -160,9 +160,9 @@ QGIFFormat::QGIFFormat() lcmap = false; newFrame = false; partialNewFrame = false; - table[0] = 0; - table[1] = 0; - stack = 0; + table[0] = nullptr; + table[1] = nullptr; + stack = nullptr; } /*! @@ -550,7 +550,7 @@ int QGIFFormat::decode(QImage *image, const uchar *buffer, int length, } oldcode=incode; const int h = image->height(); - QRgb *line = 0; + QRgb *line = nullptr; if (!out_of_bounds && h > y) line = (QRgb*)FAST_SCAN_LINE(bits, bpl, y); while (sp>stack) { diff --git a/src/plugins/imageformats/ico/.prev_CMakeLists.txt b/src/plugins/imageformats/ico/.prev_CMakeLists.txt index d054bd9936..6151d6fd07 100644 --- a/src/plugins/imageformats/ico/.prev_CMakeLists.txt +++ b/src/plugins/imageformats/ico/.prev_CMakeLists.txt @@ -1,12 +1,12 @@ # Generated from ico.pro. ##################################################################### -## qico Plugin: +## QICOPlugin Plugin: ##################################################################### -add_qt_plugin(qico +qt_add_plugin(QICOPlugin + OUTPUT_NAME qico TYPE imageformats - CLASS_NAME QICOPlugin SOURCES main.cpp main.h qicohandler.cpp qicohandler.h @@ -19,4 +19,3 @@ add_qt_plugin(qico #### Keys ignored in scope 1:.:.:ico.pro:<TRUE>: # OTHER_FILES = "ico.json" -# _LOADED = "qt_plugin" diff --git a/src/plugins/imageformats/ico/CMakeLists.txt b/src/plugins/imageformats/ico/CMakeLists.txt index d054bd9936..1174848d5e 100644 --- a/src/plugins/imageformats/ico/CMakeLists.txt +++ b/src/plugins/imageformats/ico/CMakeLists.txt @@ -1,22 +1,20 @@ # Generated from ico.pro. ##################################################################### -## qico Plugin: +## QICOPlugin Plugin: ##################################################################### -add_qt_plugin(qico +qt_add_plugin(QICOPlugin + OUTPUT_NAME qico TYPE imageformats - CLASS_NAME QICOPlugin SOURCES main.cpp main.h qicohandler.cpp qicohandler.h - LIBRARIES - Qt::CorePrivate PUBLIC_LIBRARIES Qt::Core + Qt::CorePrivate Qt::Gui ) #### Keys ignored in scope 1:.:.:ico.pro:<TRUE>: # OTHER_FILES = "ico.json" -# _LOADED = "qt_plugin" diff --git a/src/plugins/imageformats/ico/main.cpp b/src/plugins/imageformats/ico/main.cpp index baaf33e1fc..b00d8c7fd3 100644 --- a/src/plugins/imageformats/ico/main.cpp +++ b/src/plugins/imageformats/ico/main.cpp @@ -46,9 +46,9 @@ QImageIOPlugin::Capabilities QICOPlugin::capabilities(QIODevice *device, const Q if (format == "ico" || format == "cur") return Capabilities(CanRead | CanWrite); if (!format.isEmpty()) - return 0; + return { }; if (!device->isOpen()) - return 0; + return { }; Capabilities cap; if (device->isReadable() && QtIcoHandler::canRead(device)) diff --git a/src/plugins/imageformats/ico/qicohandler.cpp b/src/plugins/imageformats/ico/qicohandler.cpp index c8e31dceac..eb50f52bd6 100644 --- a/src/plugins/imageformats/ico/qicohandler.cpp +++ b/src/plugins/imageformats/ico/qicohandler.cpp @@ -535,8 +535,6 @@ QImage ICOReader::iconAt(int index) if (!mask.isNull()) { img = image; img.setAlphaChannel(mask); - // (Luckily, it seems that setAlphaChannel() does not ruin the alpha values - // of partially transparent pixels in those icons that have that) } } } @@ -615,13 +613,7 @@ bool ICOReader::write(QIODevice *device, const QVector<QImage> &images) } QImage maskImage(image.width(), image.height(), QImage::Format_Mono); image = image.convertToFormat(QImage::Format_ARGB32); - - if (image.hasAlphaChannel()) { - maskImage = image.createAlphaMask(); - } else { - maskImage.fill(0xff); - } - maskImage = maskImage.convertToFormat(QImage::Format_Mono); + maskImage.fill(Qt::color1); int nbits = 32; int bpl_bmp = ((image.width()*nbits+31)/32)*4; @@ -671,7 +663,7 @@ bool ICOReader::write(QIODevice *device, const QVector<QImage> &images) *b++ = qRed(*p); *b++ = qAlpha(*p); if (qAlpha(*p) > 0) // Even mostly transparent pixels must not be masked away - maskImage.setPixel(x, y, Qt::color1); // (i.e. createAlphaMask() takes away too much) + maskImage.setPixel(x, y, 0); p++; x++; } @@ -679,7 +671,6 @@ bool ICOReader::write(QIODevice *device, const QVector<QImage> &images) } delete[] buf; - maskImage.invertPixels(); // seems as though it needs this // NOTE! !! The mask is only flipped vertically - not horizontally !! for (y = maskImage.height() - 1; y >= 0; y--) buffer.write((char*)maskImage.scanLine(y), maskImage.bytesPerLine()); diff --git a/src/plugins/imageformats/jpeg/.prev_CMakeLists.txt b/src/plugins/imageformats/jpeg/.prev_CMakeLists.txt index 5d2f2d9a63..25b5861122 100644 --- a/src/plugins/imageformats/jpeg/.prev_CMakeLists.txt +++ b/src/plugins/imageformats/jpeg/.prev_CMakeLists.txt @@ -1,24 +1,22 @@ # Generated from jpeg.pro. ##################################################################### -## qjpeg Plugin: +## QJpegPlugin Plugin: ##################################################################### -add_qt_plugin(qjpeg +qt_add_plugin(QJpegPlugin + OUTPUT_NAME qjpeg TYPE imageformats - CLASS_NAME QJpegPlugin SOURCES main.cpp main.h qjpeghandler.cpp qjpeghandler_p.h - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate PUBLIC_LIBRARIES JPEG::JPEG Qt::Core + Qt::CorePrivate Qt::Gui + Qt::GuiPrivate ) #### Keys ignored in scope 1:.:.:jpeg.pro:<TRUE>: # OTHER_FILES = "jpeg.json" -# _LOADED = "qt_plugin" diff --git a/src/plugins/imageformats/jpeg/CMakeLists.txt b/src/plugins/imageformats/jpeg/CMakeLists.txt index 065ac08af6..6aaa6538ec 100644 --- a/src/plugins/imageformats/jpeg/CMakeLists.txt +++ b/src/plugins/imageformats/jpeg/CMakeLists.txt @@ -3,24 +3,22 @@ qt_find_package(JPEG) # special case ##################################################################### -## qjpeg Plugin: +## QJpegPlugin Plugin: ##################################################################### -add_qt_plugin(qjpeg +qt_add_plugin(QJpegPlugin + OUTPUT_NAME qjpeg TYPE imageformats - CLASS_NAME QJpegPlugin SOURCES main.cpp main.h qjpeghandler.cpp qjpeghandler_p.h - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate PUBLIC_LIBRARIES JPEG::JPEG Qt::Core + Qt::CorePrivate Qt::Gui + Qt::GuiPrivate ) #### Keys ignored in scope 1:.:.:jpeg.pro:<TRUE>: # OTHER_FILES = "jpeg.json" -# _LOADED = "qt_plugin" diff --git a/src/plugins/imageformats/jpeg/main.cpp b/src/plugins/imageformats/jpeg/main.cpp index 58442053a1..83f13c4a9d 100644 --- a/src/plugins/imageformats/jpeg/main.cpp +++ b/src/plugins/imageformats/jpeg/main.cpp @@ -51,9 +51,9 @@ QImageIOPlugin::Capabilities QJpegPlugin::capabilities(QIODevice *device, const if (format == "jpeg" || format == "jpg") return Capabilities(CanRead | CanWrite); if (!format.isEmpty()) - return 0; + return { }; if (!device->isOpen()) - return 0; + return { }; Capabilities cap; if (device->isReadable() && QJpegHandler::canRead(device)) diff --git a/src/plugins/imageformats/jpeg/qjpeghandler.cpp b/src/plugins/imageformats/jpeg/qjpeghandler.cpp index dd01138722..c31e2db3c5 100644 --- a/src/plugins/imageformats/jpeg/qjpeghandler.cpp +++ b/src/plugins/imageformats/jpeg/qjpeghandler.cpp @@ -729,7 +729,7 @@ static bool write_jpeg_image(const QImage &image, // do_write_jpeg_image (by making them non-local). struct jpeg_compress_struct cinfo; JSAMPROW row_pointer[1]; - row_pointer[0] = 0; + row_pointer[0] = nullptr; const bool success = do_write_jpeg_image(cinfo, row_pointer, image, device, @@ -751,7 +751,7 @@ public: }; QJpegHandlerPrivate(QJpegHandler *qq) - : quality(75), transformation(QImageIOHandler::TransformationNone), iod_src(0), + : quality(75), transformation(QImageIOHandler::TransformationNone), iod_src(nullptr), rgb888ToRgb32ConverterPtr(qt_convert_rgb888_to_rgb32), state(Ready), optimize(false), progressive(false), q(qq) {} @@ -761,7 +761,7 @@ public: { jpeg_destroy_decompress(&info); delete iod_src; - iod_src = 0; + iod_src = nullptr; } } @@ -954,7 +954,7 @@ bool QJpegHandlerPrivate::readJpegHeader(QIODevice *device) QByteArray exifData; - for (jpeg_saved_marker_ptr marker = info.marker_list; marker != NULL; marker = marker->next) { + for (jpeg_saved_marker_ptr marker = info.marker_list; marker != nullptr; marker = marker->next) { if (marker->marker == JPEG_COM) { QString key, value; QString s = QString::fromUtf8((const char *)marker->data, marker->data_length); |