Merge pull request #1222 from mswiger/use_g_memdup2

Use g_memdup2 instead of g_memdup
pull/1250/head^2
Alex 2021-09-17 20:56:47 +02:00 committed by GitHub
commit ce9e8aead3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 0 deletions

View File

@ -287,7 +287,11 @@ Glib::RefPtr<Gdk::Pixbuf> Item::extractPixBuf(GVariant* variant) {
if (array != nullptr) { if (array != nullptr) {
g_free(array); g_free(array);
} }
#if GLIB_MAJOR_VERSION >= 2 && GLIB_MINOR_VERSION >= 68
array = static_cast<guchar*>(g_memdup2(data, size));
#else
array = static_cast<guchar*>(g_memdup(data, size)); array = static_cast<guchar*>(g_memdup(data, size));
#endif
lwidth = width; lwidth = width;
lheight = height; lheight = height;
} }