diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2023-11-23 15:26:15 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2023-11-23 15:26:15 (GMT) |
| commit | b7fdd1e846050be4e23fa920bf275653f0ad2829 (patch) | |
| tree | a5b823d1b3bfe1ee967fae23bbb18b817e0b5f85 | |
| parent | a2594721f110178369e5c0cb5d981c4678a10708 (diff) | |
| parent | ca27387956e16b5983011ccf2205e9e1229a03a6 (diff) | |
| download | tk-b7fdd1e846050be4e23fa920bf275653f0ad2829.zip tk-b7fdd1e846050be4e23fa920bf275653f0ad2829.tar.gz tk-b7fdd1e846050be4e23fa920bf275653f0ad2829.tar.bz2 | |
Merge 8.6
| -rw-r--r-- | macosx/tkMacOSXDraw.c | 13 | ||||
| -rw-r--r-- | macosx/tkMacOSXSubwindows.c | 5 | ||||
| -rwxr-xr-x | unix/configure | 5 | ||||
| -rw-r--r-- | unix/configure.ac | 2 | ||||
| -rw-r--r-- | unix/tkConfig.h.in | 3 |
5 files changed, 4 insertions, 24 deletions
diff --git a/macosx/tkMacOSXDraw.c b/macosx/tkMacOSXDraw.c index dea8588..2aaf4ba 100644 --- a/macosx/tkMacOSXDraw.c +++ b/macosx/tkMacOSXDraw.c @@ -248,7 +248,6 @@ Tk_MacOSXGetCGContextForDrawable( if (macDraw && (macDraw->flags & TK_IS_PIXMAP) && !macDraw->context) { const size_t bitsPerComponent = 8; - size_t bitsPerPixel, bytesPerRow, len; CGColorSpaceRef colorspace = NULL; CGBitmapInfo bitmapInfo = #ifdef __LITTLE_ENDIAN__ @@ -256,25 +255,17 @@ Tk_MacOSXGetCGContextForDrawable( #else kCGBitmapByteOrderDefault; #endif - char *data; CGRect bounds = CGRectMake(0, 0, macDraw->size.width, macDraw->size.height); if (macDraw->flags & TK_IS_BW_PIXMAP) { - bitsPerPixel = 8; bitmapInfo = (CGBitmapInfo)kCGImageAlphaOnly; } else { colorspace = CGColorSpaceCreateDeviceRGB(); - bitsPerPixel = 32; bitmapInfo |= kCGImageAlphaPremultipliedFirst; } - bytesPerRow = ((size_t) - macDraw->size.width * bitsPerPixel + 127) >> 3 & ~15; - len = (size_t)(macDraw->size.height * bytesPerRow); - data = (char *)ckalloc(len); - bzero(data, len); - macDraw->context = CGBitmapContextCreate(data, (unsigned)macDraw->size.width, - (unsigned)macDraw->size.height, bitsPerComponent, bytesPerRow, + macDraw->context = CGBitmapContextCreate(NULL, (unsigned)macDraw->size.width, + (unsigned)macDraw->size.height, bitsPerComponent, 0, colorspace, bitmapInfo); if (macDraw->context) { CGContextClearRect(macDraw->context, bounds); diff --git a/macosx/tkMacOSXSubwindows.c b/macosx/tkMacOSXSubwindows.c index 64cb35a..ed44ef5 100644 --- a/macosx/tkMacOSXSubwindows.c +++ b/macosx/tkMacOSXSubwindows.c @@ -1478,11 +1478,6 @@ Tk_FreePixmap( LastKnownRequestProcessed(display)++; if (macPix->context) { - char *data = (char *)CGBitmapContextGetData(macPix->context); - - if (data) { - ckfree(data); - } CFRelease(macPix->context); } ckfree(macPix); diff --git a/unix/configure b/unix/configure index 065c0bf..d528c32 100755 --- a/unix/configure +++ b/unix/configure @@ -6961,9 +6961,7 @@ printf "%s\n" "$ac_cv_c_bigendian" >&6; } no) ;; #( universal) - -printf "%s\n" "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h - + # ;; #( *) as_fn_error $? "unknown endianness @@ -9161,7 +9159,6 @@ LTLIBOBJS=$ac_ltlibobjs CFLAGS="${CFLAGS} ${CPPFLAGS}"; CPPFLAGS="" - : "${CONFIG_STATUS=./config.status}" ac_write_fail=0 ac_clean_files_save=$ac_clean_files diff --git a/unix/configure.ac b/unix/configure.ac index 38eda9d..c2c20f4 100644 --- a/unix/configure.ac +++ b/unix/configure.ac @@ -130,7 +130,7 @@ SC_TCL_64BIT_FLAGS # Check endianness because we can optimize some operations #-------------------------------------------------------------------- -AC_C_BIGENDIAN +AC_C_BIGENDIAN(,,,[#]) #------------------------------------------------------------------------ # If Tcl and Tk are installed in different places, adjust the library diff --git a/unix/tkConfig.h.in b/unix/tkConfig.h.in index d78edb4..2f6eca6 100644 --- a/unix/tkConfig.h.in +++ b/unix/tkConfig.h.in @@ -4,9 +4,6 @@ #ifndef _TKCONFIG #define _TKCONFIG -/* Define if building universal (internal helper macro) */ -#undef AC_APPLE_UNIVERSAL_BUILD - /* Define to 1 if you have the <AvailabilityMacros.h> header file. */ #undef HAVE_AVAILABILITYMACROS_H |