diff --git a/src/core/layout/qgslayoutitempicture.cpp b/src/core/layout/qgslayoutitempicture.cpp index ff01913f0a85..0788ef481ed6 100644 --- a/src/core/layout/qgslayoutitempicture.cpp +++ b/src/core/layout/qgslayoutitempicture.cpp @@ -608,40 +608,6 @@ void QgsLayoutItemPicture::loadPicture( const QVariant &data ) emit changed(); } -QRectF QgsLayoutItemPicture::boundedImageRect( double deviceWidth, double deviceHeight ) -{ - double imageToDeviceRatio; - if ( mImage.width() / deviceWidth > mImage.height() / deviceHeight ) - { - imageToDeviceRatio = deviceWidth / mImage.width(); - const double height = imageToDeviceRatio * mImage.height(); - return QRectF( 0, 0, deviceWidth, height ); - } - else - { - imageToDeviceRatio = deviceHeight / mImage.height(); - const double width = imageToDeviceRatio * mImage.width(); - return QRectF( 0, 0, width, deviceHeight ); - } -} - -QRectF QgsLayoutItemPicture::boundedSVGRect( double deviceWidth, double deviceHeight ) -{ - double imageToSvgRatio; - if ( deviceWidth / mDefaultSvgSize.width() > deviceHeight / mDefaultSvgSize.height() ) - { - imageToSvgRatio = deviceHeight / mDefaultSvgSize.height(); - const double width = mDefaultSvgSize.width() * imageToSvgRatio; - return QRectF( 0, 0, width, deviceHeight ); - } - else - { - imageToSvgRatio = deviceWidth / mDefaultSvgSize.width(); - const double height = mDefaultSvgSize.height() * imageToSvgRatio; - return QRectF( 0, 0, deviceWidth, height ); - } -} - QSizeF QgsLayoutItemPicture::pictureSize() { if ( mMode == FormatSVG ) diff --git a/src/core/layout/qgslayoutitempicture.h b/src/core/layout/qgslayoutitempicture.h index 30e2125c9e3a..33d2c3e9eb25 100644 --- a/src/core/layout/qgslayoutitempicture.h +++ b/src/core/layout/qgslayoutitempicture.h @@ -325,11 +325,6 @@ class CORE_EXPORT QgsLayoutItemPicture: public QgsLayoutItem QgsLayoutItemPicture() = delete; - //! Calculates bounding rect for svg file (mSourcefile) such that aspect ratio is correct - QRectF boundedSVGRect( double deviceWidth, double deviceHeight ); - //! Calculates bounding rect for image such that aspect ratio is correct - QRectF boundedImageRect( double deviceWidth, double deviceHeight ); - //! Returns size of current raster or svg picture QSizeF pictureSize();