@@ -108,6 +108,29 @@ class _PatternState {
   ui.PictureRecorder? recorder;
 }
 
+/// Used by [FlutterVectorGraphicsListener] for testing purposes.
+@visibleForTesting
+abstract class PictureFactory {
+  /// Allows const subclasses.
+  const PictureFactory();
+
+  /// Create a picture recorder.
+  ui.PictureRecorder createPictureRecorder();
+
+  /// Create a canvas from the recorder.
+  ui.Canvas createCanvas(ui.PictureRecorder recorder);
+}
+
+class _DefaultPictureFactory implements PictureFactory {
+  const _DefaultPictureFactory();
+
+  @override
+  ui.Canvas createCanvas(ui.PictureRecorder recorder) => ui.Canvas(recorder);
+
+  @override
+  ui.PictureRecorder createPictureRecorder() => ui.PictureRecorder();
+}
+
 /// A listener implementation for the vector graphics codec that converts the
 /// format into a [ui.Picture].
 class FlutterVectorGraphicsListener extends VectorGraphicsCodecListener {
@@ -119,26 +142,31 @@ class FlutterVectorGraphicsListener extends VectorGraphicsCodecListener {
     Locale? locale,
     TextDirection? textDirection,
     bool clipViewbox = true,
+    @visibleForTesting
+        PictureFactory pictureFactory = const _DefaultPictureFactory(),
   }) {
-    final ui.PictureRecorder recorder = ui.PictureRecorder();
-    final ui.Canvas canvas = ui.Canvas(recorder);
+    final ui.PictureRecorder recorder = pictureFactory.createPictureRecorder();
     return FlutterVectorGraphicsListener._(
-      canvas,
+      pictureFactory,
       recorder,
+      pictureFactory.createCanvas(recorder),
       locale,
       textDirection,
       clipViewbox,
     );
   }
 
   FlutterVectorGraphicsListener._(
-    this._canvas,
+    this._pictureFactory,
     this._recorder,
+    this._canvas,
     this._locale,
     this._textDirection,
     this._clipViewbox,
   );
 
+  final PictureFactory _pictureFactory;
+
   final Locale? _locale;
   final TextDirection? _textDirection;
   final bool _clipViewbox;
@@ -349,8 +377,9 @@ class FlutterVectorGraphicsListener extends VectorGraphicsCodecListener {
       double height, Float64List transform) {
     assert(_currentPattern == null);
     _currentPattern = _PatternConfig(patternId, width, height, transform);
-    _patterns[patternId]!.recorder = ui.PictureRecorder();
-    final ui.Canvas newCanvas = ui.Canvas(_patterns[patternId]!.recorder!);
+    _patterns[patternId]!.recorder = _pictureFactory.createPictureRecorder();
+    final ui.Canvas newCanvas =
+        _pictureFactory.createCanvas(_patterns[patternId]!.recorder!);
     newCanvas.clipRect(ui.Offset(x, y) & ui.Size(width, height));
     _patterns[patternId]!.canvas = newCanvas;
   }
@@ -360,7 +389,13 @@ class FlutterVectorGraphicsListener extends VectorGraphicsCodecListener {
       ui.PictureRecorder? patternRecorder, ui.Canvas canvas) {
     final FlutterVectorGraphicsListener patternListener =
         FlutterVectorGraphicsListener._(
-            canvas, patternRecorder!, _locale, _textDirection, _clipViewbox);
+      _pictureFactory,
+      patternRecorder!,
+      canvas,
+      _locale,
+      _textDirection,
+      _clipViewbox,
+    );
 
     patternListener._size =
         ui.Size(currentPattern!._width, currentPattern._height);
@@ -561,10 +596,11 @@ class FlutterVectorGraphicsListener extends VectorGraphicsCodecListener {
       _canvas.save();
       _canvas.transform(transform);
     }
-    paintImage(
-      canvas: _canvas,
-      rect: ui.Rect.fromLTWH(x, y, width, height),
-      image: image,
+    _canvas.drawImageRect(
+      image,
+      ui.Rect.fromLTRB(0, 0, image.width.toDouble(), image.height.toDouble()),
+      ui.Rect.fromLTWH(x, y, width, height),
+      Paint(),
     );
     if (transform != null) {
       _canvas.restore();
 
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+import 'dart:convert' show base64;
 import 'dart:typed_data';
 import 'dart:ui' as ui;
 
@@ -18,6 +19,9 @@ void main() {
 </svg>
 ''';
 
+  const String bluePngPixel =
+      'iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mNkYPj/HwADBwIAMCbHYQAAAABJRU5ErkJggg==';
+
   late ByteData vectorGraphicBuffer;
 
   setUpAll(() async {
@@ -60,4 +64,49 @@ void main() {
     expect(imageBytes.first, 0xFF000000);
     expect(imageBytes.last, 0xFF000000);
   }, skip: kIsWeb);
+
+  test('Scales image correctly', () async {
+    final TestPictureFactory factory = TestPictureFactory();
+    final FlutterVectorGraphicsListener listener =
+        FlutterVectorGraphicsListener(
+      pictureFactory: factory,
+    );
+    listener.onImage(0, 0, base64.decode(bluePngPixel));
+    await listener.waitForImageDecode();
+    listener.onDrawImage(0, 10, 10, 30, 30, null);
+    final Invocation drawRect = factory.fakeCanvases.first.invocations.single;
+    expect(drawRect.isMethod, true);
+    expect(drawRect.memberName, #drawImageRect);
+    expect(
+      drawRect.positionalArguments[1],
+      const ui.Rect.fromLTRB(0, 0, 1, 1),
+    );
+    expect(
+      drawRect.positionalArguments[2],
+      const ui.Rect.fromLTRB(10, 10, 40, 40),
+    );
+  });
+}
+
+class TestPictureFactory implements PictureFactory {
+  final List<FakeCanvas> fakeCanvases = <FakeCanvas>[];
+  @override
+  ui.Canvas createCanvas(ui.PictureRecorder recorder) {
+    fakeCanvases.add(FakeCanvas());
+    return fakeCanvases.last;
+  }
+
+  @override
+  ui.PictureRecorder createPictureRecorder() => FakePictureRecorder();
+}
+
+class FakePictureRecorder extends Fake implements ui.PictureRecorder {}
+
+class FakeCanvas implements ui.Canvas {
+  final List<Invocation> invocations = <Invocation>[];
+
+  @override
+  dynamic noSuchMethod(Invocation invocation) {
+    invocations.add(invocation);
+  }
 }