summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPo Lu <luangruo@yahoo.com>2024-07-24 20:06:15 +0800
committerPo Lu <luangruo@yahoo.com>2024-07-24 20:13:01 +0800
commit23549d7175108ca632375f9cc4390ff3e53e4d1e (patch)
tree20fd16e21b3339db5d784c036b33991698d554db
parentcb633820c151c9cf428a88f43b0a62f185c4f587 (diff)
downloademacs-23549d7175108ca632375f9cc4390ff3e53e4d1e.tar.gz
emacs-23549d7175108ca632375f9cc4390ff3e53e4d1e.tar.bz2
emacs-23549d7175108ca632375f9cc4390ff3e53e4d1e.zip
* src/image.c (gui_put_x_image): Avoid memory leak.
-rw-r--r--src/image.c9
1 files 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