[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
emacs-30 23549d71751: * src/image.c (gui_put_x_image): Avoid memory leak
From: |
Po Lu |
Subject: |
emacs-30 23549d71751: * src/image.c (gui_put_x_image): Avoid memory leak. |
Date: |
Wed, 24 Jul 2024 08:13:13 -0400 (EDT) |
branch: emacs-30
commit 23549d7175108ca632375f9cc4390ff3e53e4d1e
Author: Po Lu <luangruo@yahoo.com>
Commit: Po Lu <luangruo@yahoo.com>
* src/image.c (gui_put_x_image): Avoid memory leak.
---
src/image.c | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/src/image.c b/src/image.c
index 96280f3ef46..db1b05cbcd7 100644
--- a/src/image.c
+++ b/src/image.c
@@ -4176,7 +4176,7 @@ static void
gui_put_x_image (struct frame *f, Emacs_Pix_Container pimg,
Emacs_Pixmap pixmap, int width, int height)
{
-#if defined USE_CAIRO || defined HAVE_HAIKU
+#if defined USE_CAIRO || defined HAVE_HAIKU || defined HAVE_NS
eassert (pimg == pixmap);
#elif defined HAVE_X_WINDOWS
GC gc;
@@ -4188,12 +4188,7 @@ gui_put_x_image (struct frame *f, Emacs_Pix_Container
pimg,
XFreeGC (FRAME_X_DISPLAY (f), gc);
#elif defined HAVE_ANDROID
android_put_image (pixmap, pimg);
-#endif
-
-#ifdef HAVE_NS
- eassert (pimg == pixmap);
- ns_retain_object (pimg);
-#endif
+#endif /* HAVE_ANDROID */
}
/* Thin wrapper for image_create_x_image_and_pixmap_1, so that it matches
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- emacs-30 23549d71751: * src/image.c (gui_put_x_image): Avoid memory leak.,
Po Lu <=