diff --git a/include/ssdp/SSDPDiscover.h b/include/ssdp/SSDPDiscover.h index 290a7690..4dc899b9 100644 --- a/include/ssdp/SSDPDiscover.h +++ b/include/ssdp/SSDPDiscover.h @@ -89,13 +89,6 @@ public: /// int discoverServices(const QString &searchTarget="ssdp:all", const QString &key="LOCATION"); - /// - /// @brief Get services discovered during discoverServices() - /// - /// @return Map of discovered services - /// - const QMap getServicesDiscovered () { return _services; } - /// /// @brief Get services discovered during discoverServices(). /// diff --git a/libsrc/ssdp/SSDPDiscover.cpp b/libsrc/ssdp/SSDPDiscover.cpp index d1e1ee50..ff241b0f 100644 --- a/libsrc/ssdp/SSDPDiscover.cpp +++ b/libsrc/ssdp/SSDPDiscover.cpp @@ -271,11 +271,11 @@ int SSDPDiscover::discoverServices(const QString& searchTarget, const QString& k if ( _skipDupKeys ) { - _services.insert(mapKey, service); + _services.replace(mapKey, service); } else { - _services.insertMulti(mapKey, service); + _services.insert(mapKey, service); } } } diff --git a/libsrc/utils/ImageResampler.cpp b/libsrc/utils/ImageResampler.cpp index 11cbfd0e..204e4fd7 100644 --- a/libsrc/utils/ImageResampler.cpp +++ b/libsrc/utils/ImageResampler.cpp @@ -61,8 +61,7 @@ void ImageResampler::processImage(const uint8_t * data, int width, int height, i int outputWidth = (width - _cropLeft - cropRight - (_horizontalDecimation >> 1) + _horizontalDecimation - 1) / _horizontalDecimation; int outputHeight = (height - _cropTop - cropBottom - (_verticalDecimation >> 1) + _verticalDecimation - 1) / _verticalDecimation; - if (outputImage.width() != outputWidth || outputImage.height() != outputHeight) - outputImage.resize(outputWidth, outputHeight); + outputImage.resize(outputWidth, outputHeight); for (int yDest = 0, ySource = _cropTop + (_verticalDecimation >> 1); yDest < outputHeight; ySource += _verticalDecimation, ++yDest) {