patch 9.2.0643: Missing Image ifdefs

Problem:  Missing Image ifdefs
Solution: Add missing FEAT_IMAGE_GDK ifdefs (Foxe Chen).

closes: #20516

Signed-off-by: Foxe Chen <chen.foxe@gmail.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>

diff --git a/src/drawscreen.c b/src/drawscreen.c
index 58b54c3b39c5666cb1eca76bf94897cc048c1987..be5f77a5388aaecfe3c6f7955a7156fb5ef2c73d 100644 (file)
--- a/src/drawscreen.c
+++ b/src/drawscreen.c
@@ -449,7 +449,8 @@ update_screen(int type_arg)
     }
 #endif
 
-#if defined(FEAT_IMAGE_GDI) || defined(FEAT_IMAGE_CAIRO)
+#if defined(FEAT_IMAGE_GDI) || defined(FEAT_IMAGE_CAIRO) \
+    || defined(FEAT_IMAGE_GDK)
     // GUI only: the cursor redraw and other late blits paint directly onto
     // the canvas and may damage the popup images blitted by update_popups();
     // restore the image layer.  No-op in terminal mode.

diff --git a/src/popupwin.c b/src/popupwin.c
index ac2158f78be3443370deb59ad5fc98255745c962..e5c936400f3499a35b0629a7af366b5e0c98d5e7 100644 (file)
--- a/src/popupwin.c
+++ b/src/popupwin.c
@@ -2076,8 +2076,9 @@ popup_image_composites_frames(void)
        // The surface is composed off-screen before it is exposed, so the
        // repaint cannot flicker there.
        return true;
-#  else
-       // GDI blits with SRCCOPY: a full replace, no residue.
+#  elif defined(FEAT_IMAGE_GDI) || defined(FEAT_IMAGE_GDK)
+       // GDI blits with SRCCOPY: a full replace, no residue. GDK uses retained
+       // render nodes, so there is no blitting in the first place.
        return false;
 #  endif
 # endif
@@ -7147,7 +7148,8 @@ popup_images_invalidate(void)
  * here would instead paint a lower zindex image over the cells of a
  * higher zindex popup drawn on top of it.
  */
-# if defined(FEAT_IMAGE_GDI) || defined(FEAT_IMAGE_CAIRO)
+# if defined(FEAT_IMAGE_GDI) || defined(FEAT_IMAGE_CAIRO) \
+    || defined(FEAT_IMAGE_GDK)
     void
 update_popup_images(void)
 {

diff --git a/src/version.c b/src/version.c
index 4611e8488ab493232a6c1ec5f77996e454486c12..edb97373162ace63f91d5a6fb2540a4f3828703f 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -759,6 +759,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    643,
 /**/
     642,
 /**/