diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2025-09-20 19:20:03 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2025-09-20 19:20:03 +0200 |
| commit | b45d74b60dfb7e23911df6b0523890e42f711267 (patch) | |
| tree | 42bb5764b05bd3bc5bffadb55f4375e6dce8a521 /app/wlib/gtklib/pixbuf.c | |
| parent | 6c1a798b0302034a7fdcaf93b8f014e2e458c2a0 (diff) | |
| parent | 63ec5715054be18ac4db5675e067b41c955d03b9 (diff) | |
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'app/wlib/gtklib/pixbuf.c')
| -rw-r--r-- | app/wlib/gtklib/pixbuf.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/app/wlib/gtklib/pixbuf.c b/app/wlib/gtklib/pixbuf.c index 0d6e8b7..d0c1068 100644 --- a/app/wlib/gtklib/pixbuf.c +++ b/app/wlib/gtklib/pixbuf.c @@ -48,14 +48,20 @@ GdkPixbuf* wlibMakePixbuf( wIcon_p ip) { GdkPixbuf * pixbuf; +#ifdef LATER char line0[40]; char line2[40]; +#endif assert(ip != NULL); - if (ip->gtkIconType == gtkIcon_pixmap) { - pixbuf = gdk_pixbuf_new_from_xpm_data((const char**)ip->bits); + assert( ip->gtkIconType == gtkIcon_pixmap ); + assert ( *(int*)ip->bits == 0x47646b50 || + *(int*)ip->bits == 0x506b6447 ); + pixbuf = gdk_pixbuf_new_from_inline( -1, ip->bits, FALSE, NULL ); +#ifdef LATER } else { + assert( ip->gtkIconType != gtkIcon_pixmap ); const char * bits; long rgb; int row,col,wb; @@ -92,6 +98,7 @@ GdkPixbuf* wlibMakePixbuf( g_free(pixmapData[row+3]); } } +#endif return pixbuf; } |