Changeset 23796 in vbox

Timestamp:

Oct 15, 2009 12:41:14 PM (15 years ago)

Author:

vboxsync

Message:

FE/Qt4-OSX: fix memory leaks in drawing code

File:

• trunk/src/VBox/Frontends/VirtualBox/src/VBoxFBQuartz2D.cpp (modified) (6 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/VBoxFBQuartz2D.cpp

@@ -52 +52 @@
 {
     Log (("Quartz2D: Creating\n"));
-    resizeEvent (new VBoxResizeEvent (FramebufferPixelFormat_Opaque,
-                                      NULL, 0, 0, 640, 480));
+
+    VBoxResizeEvent event(FramebufferPixelFormat_Opaque,
+                          NULL, 0, 0, 640, 480);
+    resizeEvent (&event);
 }
 
@@ -179 +181 @@
         CGImageRef subImage;
         if (!mView->pauseShot().isNull())
-            subImage = CGImageCreateWithImageInRect (::darwinToCGImageRef (&mView->pauseShot()), CGRectMake (mView->contentsX(), mView->contentsY(), mView->visibleWidth(), mView->visibleHeight()));
+        {
+            CGImageRef pauseImg = ::darwinToCGImageRef (&mView->pauseShot());
+            subImage = CGImageCreateWithImageInRect (pauseImg, CGRectMake (mView->contentsX(), mView->contentsY(), mView->visibleWidth(), mView->visibleHeight()));
+            CGImageRelease (pauseImg);
+        }
         else
             subImage = CGImageCreateWithImageInRect (mImage, CGRectMake (mView->contentsX(), mView->contentsY(), mView->visibleWidth(), mView->visibleHeight()));
@@ -215 +221 @@
         CGContextEndTransparencyLayer (ctx);
 #endif
+        CGImageRelease (subImage);
     }
     else
@@ -226 +233 @@
         CGImageRef subImage;
         if (!mView->pauseShot().isNull())
-            subImage = CGImageCreateWithImageInRect (::darwinToCGImageRef (&mView->pauseShot()), ::darwinToCGRect (is));
+        {
+            CGImageRef pauseImg = ::darwinToCGImageRef (&mView->pauseShot());
+            subImage = CGImageCreateWithImageInRect (pauseImg, ::darwinToCGRect (is));
+            CGImageRelease (pauseImg);
+        }
         else
             subImage = CGImageCreateWithImageInRect (mImage, ::darwinToCGRect (is));
@@ -247 +258 @@
         /* At this point draw the real vm image */
         CGContextDrawImage (ctx, ::darwinFlipCGRect (::darwinToCGRect (ir), viewRect.size.height), subImage);
+
+        CGImageRelease (subImage);
     }
 }
@@ -276 +289 @@
     {
 //        printf ("VRAM\n");
-        CGColorSpaceRef cs = CGColorSpaceCreateDeviceRGB();
         /* Create the image copy of the framebuffer */
         CGDataProviderRef dp = CGDataProviderCreateWithData (NULL, aEvent->VRAM(), aEvent->bitsPerPixel() / 8 * mWdt * mHgt, NULL);