summaryrefslogtreecommitdiffstats
path: root/macosx
diff options
context:
space:
mode:
authorfvogel <fvogelnew1@free.fr>2023-05-23 17:27:04 (GMT)
committerfvogel <fvogelnew1@free.fr>2023-05-23 17:27:04 (GMT)
commitcfbfc56ab08376755eb01d9a30ab48af0fefe7cc (patch)
treeb5b1ab84bf34abaf759c8c0a9d82f6abe422ebf8 /macosx
parent160c4d3cd01e9d5a95764555485d0333a9b39938 (diff)
parent32f8bb378efc9adff995512edc41ae596728488b (diff)
downloadtk-cfbfc56ab08376755eb01d9a30ab48af0fefe7cc.zip
tk-cfbfc56ab08376755eb01d9a30ab48af0fefe7cc.tar.gz
tk-cfbfc56ab08376755eb01d9a30ab48af0fefe7cc.tar.bz2
Fix [f40d9debad]: Aqua: fix size of FourCC bitmaps. Patch from Christopher Chavez.
Diffstat (limited to 'macosx')
-rw-r--r--macosx/tkMacOSXBitmap.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/macosx/tkMacOSXBitmap.c b/macosx/tkMacOSXBitmap.c
index 1951518..49736f0 100644
--- a/macosx/tkMacOSXBitmap.c
+++ b/macosx/tkMacOSXBitmap.c
@@ -307,8 +307,6 @@ TkpGetNativeAppBitmap(
}
}
if (image) {
- *width = size.width;
- *height = size.height;
pixmap = PixmapFromImage(display, image, NSSizeToCGSize(size));
} else if (name) {
/*
@@ -323,6 +321,8 @@ TkpGetNativeAppBitmap(
pixmap = PixmapFromImage(display, iconImage, NSSizeToCGSize(size));
}
}
+ *width = size.width;
+ *height = size.height;
return pixmap;
}