qgis · Dec 5, 2018
diff --git a/‎python/core/auto_generated/qgsimagecache.sip.in
Lines changed: 2 additions & 1 deletion b/‎python/core/auto_generated/qgsimagecache.sip.in
Lines changed: 2 additions & 1 deletion
diff --git a/‎src/core/qgsimagecache.h
Lines changed: 2 additions & 1 deletion b/‎src/core/qgsimagecache.h
Lines changed: 2 additions & 1 deletion
diff --git a/‎tests/src/python/test_qgsimagecache.py
Lines changed: 1 addition & 1 deletion b/‎tests/src/python/test_qgsimagecache.py
Lines changed: 1 addition & 1 deletion
diff --git a/‎tests/testdata/control_images/image_cache/expected_opaque_image/expected_opaque_image.png
10.9 KB b/‎tests/testdata/control_images/image_cache/expected_opaque_image/expected_opaque_image.png
10.9 KB
diff --git a/‎tests/testdata/control_images/image_cache/expected_opaque_image/expected_opaque_image_mask.png
2.91 KB b/‎tests/testdata/control_images/image_cache/expected_opaque_image/expected_opaque_image_mask.png
2.91 KB
@@ -44,7 +44,8 @@ size, and then the result cached for subsequent lookups.
 ``path`` may be a local file, remote (HTTP) url, or a base 64 encoded string (with a "base64:" prefix).
 
 The ``size`` parameter dictates the target size of the image. An invalid size indicates the
-original raster image size (with no resampling).
+original raster image size (with no resampling). A size in which the width or height is
+set to zero will have the zeroed value automatically computed when keepAspectRatio is true.
 
 If ``keepAspectRatio`` is true, then the original raster aspect ratio will be maintained during
 any resampling operations.
 
@@ -106,7 +106,8 @@ class CORE_EXPORT QgsImageCache : public QgsAbstractContentCache< QgsImageCacheE
      * \a path may be a local file, remote (HTTP) url, or a base 64 encoded string (with a "base64:" prefix).
      *
      * The \a size parameter dictates the target size of the image. An invalid size indicates the
-     * original raster image size (with no resampling).
+     * original raster image size (with no resampling). A size in which the width or height is
+     * set to zero will have the zeroed value automatically computed when keepAspectRatio is true.
      *
      * If \a keepAspectRatio is true, then the original raster aspect ratio will be maintained during
      * any resampling operations.
 
@@ -77,7 +77,7 @@ def testRemoteImage(self):
         image, in_cache = QgsApplication.imageCache().pathAsImage(url, QSize(100, 100), 1.0, True)
 
         self.assertTrue(self.imageCheck('Remote Image', 'remote_image', image))
-        self.assertEqual(QgsApplication.imageCache().originalSize(url), QSize(511, 800))
+        self.assertEqual(QgsApplication.imageCache().originalSize(url), QSize(511, 800), 1.0)
 
     def testRemoteImageMissing(self):
         """Test fetching remote image with bad url"""
Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,8 @@ class CORE_EXPORT QgsImageCache : public QgsAbstractContentCache< QgsImageCacheE`
`106`	`106`	`* \a path may be a local file, remote (HTTP) url, or a base 64 encoded string (with a "base64:" prefix).`
`107`	`107`	`*`
`108`	`108`	`* The \a size parameter dictates the target size of the image. An invalid size indicates the`
`109`		`- * original raster image size (with no resampling).`
	`109`	`+ * original raster image size (with no resampling). A size in which the width or height is`
	`110`	`+ * set to zero will have the zeroed value automatically computed when keepAspectRatio is true.`
`110`	`111`	`*`
`111`	`112`	`* If \a keepAspectRatio is true, then the original raster aspect ratio will be maintained during`
`112`	`113`	`* any resampling operations.`