Revision: 28565
http://sourceforge.net/p/bibdesk/svn/28565
Author: hofman
Date: 2024-01-06 22:22:13 +0000 (Sat, 06 Jan 2024)
Log Message:
-----------
don't assign to unallocated pointer reference
Modified Paths:
--------------
trunk/bibdesk/BDSKLineTextField.m
trunk/bibdesk/NSPointerFunctions_BDSKExtensions.m
Modified: trunk/bibdesk/BDSKLineTextField.m
===================================================================
--- trunk/bibdesk/BDSKLineTextField.m 2024-01-06 18:46:38 UTC (rev 28564)
+++ trunk/bibdesk/BDSKLineTextField.m 2024-01-06 22:22:13 UTC (rev 28565)
@@ -46,14 +46,17 @@
- (NSSize)intrinsicContentSize {
static NSMapTable *heightTable = nil;
NSFont *font = [self font];
- CGFloat *height = heightTable ? (CGFloat *)NSMapGet(heightTable, (__bridge
void *)font) : NULL;
- if (height == NULL) {
- *height = [[self font] defaultViewLineHeight];
+ CGFloat height;
+ CGFloat *heightPtr = heightTable ? (CGFloat *)NSMapGet(heightTable,
(__bridge void *)font) : NULL;
+ if (heightPtr == NULL) {
+ height = [font defaultViewLineHeight];
if (heightTable == nil)
heightTable = [[NSMapTable alloc]
initWithKeyPointerFunctions:[NSPointerFunctions
pointerFunctionsWithOptions:NSPointerFunctionsStrongMemory |
NSPointerFunctionsObjectPersonality] valuePointerFunctions:[NSPointerFunctions
floatPointerFunctions] capacity:0];
- NSMapInsert(heightTable, (__bridge void *)font, (void *)height);
+ NSMapInsert(heightTable, (__bridge void *)font, &height);
+ } else {
+ height = *heightPtr;
}
- return NSMakeSize(NSViewNoIntrinsicMetric, *height);
+ return NSMakeSize(NSViewNoIntrinsicMetric, height);
}
@end
Modified: trunk/bibdesk/NSPointerFunctions_BDSKExtensions.m
===================================================================
--- trunk/bibdesk/NSPointerFunctions_BDSKExtensions.m 2024-01-06 18:46:38 UTC
(rev 28564)
+++ trunk/bibdesk/NSPointerFunctions_BDSKExtensions.m 2024-01-06 22:22:13 UTC
(rev 28565)
@@ -89,7 +89,7 @@
return [(__bridge BibItem *)item equivalenceHash];
}
-static NSUInteger floatSizeFunction(const void *item) { return
sizeof(NSPoint); }
+static NSUInteger floatSizeFunction(const void *item) { return
sizeof(CGFloat); }
static NSString *floatDescriptionFunction(const void *item) { return [NSString
stringWithFormat:@"%f", *(CGFloat *)item]; }
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
Bibdesk-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/bibdesk-commit
