]> xenbits.xensource.com Git - libvirt.git/commitdiff
vbox: fix _displayTakeScreenShotPNGToArray
authorDawid Zamirski <dzamirski@datto.com>
Thu, 29 Dec 2016 20:34:31 +0000 (15:34 -0500)
committerJohn Ferlan <jferlan@redhat.com>
Wed, 11 Jan 2017 00:20:07 +0000 (19:20 -0500)
This function was not implemented for vbox 5+ which removed
TakeScreenShotPNGToArray but provides TakeScreenShotToArray with
BitmapFormat_PNG argument which is the same thing.

src/vbox/vbox_tmpl.c

index 514f4d2c62c0424e4d8b972a100a36fe4ef78a36..de039e29fe1d0e1133236dd4b4ac4291671a7367 100644 (file)
@@ -2029,21 +2029,20 @@ _displayGetScreenResolution(IDisplay *display ATTRIBUTE_UNUSED,
 }
 
 static nsresult
-_displayTakeScreenShotPNGToArray(IDisplay *display ATTRIBUTE_UNUSED,
-                                 PRUint32 screenId ATTRIBUTE_UNUSED,
-                                 PRUint32 width ATTRIBUTE_UNUSED,
-                                 PRUint32 height ATTRIBUTE_UNUSED,
-                                 PRUint32 *screenDataSize ATTRIBUTE_UNUSED,
-                                 PRUint8** screenData ATTRIBUTE_UNUSED)
-{
-#if VBOX_API_VERSION < 4000000 || VBOX_API_VERSION >= 5000000
-    vboxUnsupported();
-    return 0;
-#else /* VBOX_API_VERSION >= 4000000 && VBOX_API_VERSION < 5000000 */
+_displayTakeScreenShotPNGToArray(IDisplay *display, PRUint32 screenId,
+                                 PRUint32 width, PRUint32 height,
+                                 PRUint32 *screenDataSize,
+                                 PRUint8** screenData)
+{
+#if VBOX_API_VERSION >= 5000000
+    return display->vtbl->TakeScreenShotToArray(display, screenId, width,
+                                                height, BitmapFormat_PNG,
+                                                screenDataSize, screenData);
+#else /* VBOX_API_VERSION < 5000000 */
     return display->vtbl->TakeScreenShotPNGToArray(display, screenId, width,
                                                    height, screenDataSize,
                                                    screenData);
-#endif /* VBOX_API_VERSION >= 4000000 */
+#endif /* VBOX_API_VERSION >= 5000000 */
 }
 
 static nsresult