[BOX32] Improved handlong of XImage

3 files changed, 20 insertions, 2 deletions

diff --git a/src/libtools/my_x11_conv.c b/src/libtools/my_x11_conv.c
index d0f961e2..00978504 100644
--- a/src/libtools/my_x11_conv.c
+++ b/src/libtools/my_x11_conv.c
@@ -983,4 +983,17 @@ void convert_XSetWindowAttributes_to_64(my_XSetWindowAttributes_t* dst, my_XSetW
     dst->override_redirect = src->override_redirect;
     dst->colormap = from_ulong(src->colormap);
     dst->cursor = from_ulong(src->cursor);
-}
\ No newline at end of file
+}
+
+void* inplace_XImage_shrink(void* a)
+{
+    if(!a) return NULL;
+    WrapXImage(a, a);
+    return a;
+}
+void* inplace_XImage_enlarge(void* a)
+{
+    if(!a) return NULL;
+    UnwrapXImage(a, a);
+    return a;
+}
diff --git a/src/libtools/my_x11_conv.h b/src/libtools/my_x11_conv.h
index 10b8229b..e17073a1 100644
--- a/src/libtools/my_x11_conv.h
+++ b/src/libtools/my_x11_conv.h
@@ -52,4 +52,9 @@ void inplace_XFontStruct_enlarge(void* a);
 
 void convert_XSetWindowAttributes_to_64(my_XSetWindowAttributes_t* dst, my_XSetWindowAttributes_32_t* src);
 
+void WrapXImage(void* d, void* s);  //define in wrappedx11.c because it contains callbacks
+void UnwrapXImage(void* d, void* s);
+void* inplace_XImage_shrink(void* a);
+void* inplace_XImage_enlarge(void* a);
+
 #endif//MY_X11_CONV
\ No newline at end of file
diff --git a/src/libtools/my_x11_defs_32.h b/src/libtools/my_x11_defs_32.h
index 10e3ce23..00756242 100644
--- a/src/libtools/my_x11_defs_32.h
+++ b/src/libtools/my_x11_defs_32.h
@@ -29,7 +29,7 @@ typedef struct _XImage_32 {
     ulong_t red_mask;
     ulong_t green_mask;
     ulong_t blue_mask;
-    ptr_t    obdata;
+    ptr_t   obdata;
     ximage_32_t f;
 } XImage_32;