AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2025-01-16 07:04:29 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'matthiasc/for-main' into 'main'

Browse Source 
Matthiasc/for main

See merge request GNOME/gtk!6619
This commit is contained in:
Matthias Clasen 2023-11-27 14:59:30 +00:00
commit 9bf4a45d47
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/CODING-STYLE.md
View File

@ -685,6 +685,8 @@ stack-allocated using `g_newa()` or `g_alloca()`. But limit the amount
of stack memory that you consume this way, in particular in recursive of stack memory that you consume this way, in particular in recursive
functions. functions.
On Windows, the default stack size we have to work with is 1M.
### Macros ### Macros
Try to avoid private macros unless strictly necessary. Remember to #undef Try to avoid private macros unless strictly necessary. Remember to #undef

3
gdk/gdkdmabuf.c
View File

@ -710,7 +710,8 @@ gdk_dmabuf_direct_downloader_do_download (const GdkDmabufDownloader *downloader,
dmabuf = gdk_dmabuf_texture_get_dmabuf (GDK_DMABUF_TEXTURE (texture)); dmabuf = gdk_dmabuf_texture_get_dmabuf (GDK_DMABUF_TEXTURE (texture));
info = get_drm_format_info (dmabuf->fourcc); info = get_drm_format_info (dmabuf->fourcc);
g_return_if_fail (info->download);
g_return_if_fail (info && info->download);
GDK_DISPLAY_DEBUG (gdk_dmabuf_texture_get_display (GDK_DMABUF_TEXTURE (texture)), DMABUF, GDK_DISPLAY_DEBUG (gdk_dmabuf_texture_get_display (GDK_DMABUF_TEXTURE (texture)), DMABUF,
"Using %s for downloading a dmabuf (format %.4s:%#" G_GINT64_MODIFIER "x)", "Using %s for downloading a dmabuf (format %.4s:%#" G_GINT64_MODIFIER "x)",