diff --git a/test/v4l2_to_png/V4L2Grabber.cpp b/test/v4l2_to_png/V4L2Grabber.cpp
index 3c959621..f278a432 100644
--- a/test/v4l2_to_png/V4L2Grabber.cpp
+++ b/test/v4l2_to_png/V4L2Grabber.cpp
@@ -593,8 +593,7 @@ void V4L2Grabber::process_image(const uint8_t * data)
 	int width = (_width + _pixelDecimation/2) / _pixelDecimation;
 	int height = (_height + _pixelDecimation/2) / _pixelDecimation;
 
-
-	QImage image(width, height, QImage::Format_RGB888);
+	Image<ColorRgb> image(width, height);
 
 	for (int ySource = _pixelDecimation/2, yDest = 0; ySource < _height; ySource += _pixelDecimation, ++yDest)
 	{
@@ -605,14 +604,14 @@ void V4L2Grabber::process_image(const uint8_t * data)
 			uint8_t u = (xSource%2 == 0) ? data[index] : data[index-2];
 			uint8_t v = (xSource%2 == 0) ? data[index+2] : data[index];
 
-			uint8_t r, g, b;
-			yuv2rgb(y, u, v, r, g, b);
-
-			image.setPixel(xDest, yDest, qRgb(r, g, b));
+			ColorRgb & rgb = image(xDest, yDest);
+			yuv2rgb(y, u, v, rgb.red, rgb.green, rgb.blue);
 		}
 	}
 
-	image.save("screenshot.png");
+	// store as PNG
+	QImage pngImage((const uint8_t *) image.memptr(), width, height, 3*width, QImage::Format_RGB888);
+	pngImage.save("screenshot.png");
 }
 
 int V4L2Grabber::xioctl(int request, void *arg)
diff --git a/test/v4l2_to_png/V4L2Grabber.h b/test/v4l2_to_png/V4L2Grabber.h
index cc9de6af..1b23e761 100644
--- a/test/v4l2_to_png/V4L2Grabber.h
+++ b/test/v4l2_to_png/V4L2Grabber.h
@@ -4,6 +4,10 @@
 #include <string>
 #include <vector>
 
+// util includes
+#include <utils/Image.h>
+#include <utils/ColorRgb.h>
+
 /// Capture class for V4L2 devices
 ///
 /// @see http://linuxtv.org/downloads/v4l-dvb-apis/capture-example.html