[kismac] [binaervarianz] r217 - in trunk/Sources: Core Support Views Views/GPSSatInfo
- From: svn@xxxxxxxxxxxxxxxx
- To: kismac@xxxxxxxxxxxxx
- Date: Sun, 12 Nov 2006 06:39:37 +0100
Author: gkruse
Date: 2006-11-12 06:39:33 +0100 (Sun, 12 Nov 2006)
New Revision: 217
Modified:
trunk/Sources/Core/WaveContainer.m
trunk/Sources/Support/GPSController.m
trunk/Sources/Views/GPSSatInfo/GPSSatInfo.m
trunk/Sources/Views/PointView.m
Log:
applying memory fixes from #183
Modified: trunk/Sources/Core/WaveContainer.m
===================================================================
--- trunk/Sources/Core/WaveContainer.m 2006-10-25 19:17:20 UTC (rev 216)
+++ trunk/Sources/Core/WaveContainer.m 2006-11-12 05:39:33 UTC (rev 217)
@@ -725,7 +725,7 @@
return _idList[_sortedList[index]].net;
}
- (WaveNet*) netForKey:(unsigned char*) ID {
- unsigned int i, l, entry = LOOKUPSIZE;
+ unsigned long i, l, entry = LOOKUPSIZE;
//lookup the net in the hashtable
l = hashForMAC(ID);
Modified: trunk/Sources/Support/GPSController.m
===================================================================
--- trunk/Sources/Support/GPSController.m 2006-10-25 19:17:20 UTC (rev
216)
+++ trunk/Sources/Support/GPSController.m 2006-11-12 05:39:33 UTC (rev
217)
@@ -545,6 +545,7 @@
- (bool)gpsd_parse:(int) fd {
int len, valid, numsat, veldir;
char gpsbuf[MAX_GPSBUF_LEN];
+ char gpsbufII[MAX_GPSBUF_LEN];
double ns, ew, elev;
float velkt,hdop,fveldir;
float timeinterval=-1;
@@ -570,6 +571,7 @@
_linesRead++;
gpsbuf[0+len]=0;
+ gpsbufII[0+len]=0;
numsat = -1;
hdop = 100;
elev = 0;
@@ -655,7 +657,7 @@
NSString *gpsbuf2, *thisprn;
NSRange range,range2;
- int numsat;
+ int satnum;
int length;
int prn,signal,used;
NSArray *prns,*attrs;
@@ -665,17 +667,17 @@
return NO;
}
- if((len = read(fd, &gpsbuf[0], MAX_GPSBUF_LEN)) < 0) {
+ if((len = read(fd, &gpsbufII[0], MAX_GPSBUF_LEN)) < 0) {
NSLog(@"GPSd read failed");
return NO;
}
@try {
- gpsbuf2 = [NSString stringWithCString:gpsbuf
length:len];
+ gpsbuf2 = [NSString stringWithCString:gpsbufII
length:len];
range = [gpsbuf2 rangeOfString:@":"];
range2 = NSMakeRange(range.location - 2,2);
- numsat = [[gpsbuf2 substringWithRange:range2] intValue];
+ satnum = [[gpsbuf2 substringWithRange:range2] intValue];
prns = [gpsbuf2 componentsSeparatedByString:@":"];
length = [prns count];
Modified: trunk/Sources/Views/GPSSatInfo/GPSSatInfo.m
===================================================================
--- trunk/Sources/Views/GPSSatInfo/GPSSatInfo.m 2006-10-25 19:17:20 UTC (rev
216)
+++ trunk/Sources/Views/GPSSatInfo/GPSSatInfo.m 2006-11-12 05:39:33 UTC (rev
217)
@@ -49,7 +49,7 @@
bool used;
bp = [NSBezierPath bezierPathWithRect:[self bounds]];
- [[NSColor colorWithCalibratedRed:0.2 green:0.2 blue:0.2 alpha:0.7] set];
+ [[NSColor colorWithCalibratedRed:0.3 green:0.3 blue:0.3 alpha:1] set];
[bp fill];
for (currentsat = 1; currentsat <= 12; currentsat++) {
@@ -252,9 +252,7 @@
}
- (void)redraw {
- [self lockFocus];
[self setNeedsDisplay:YES];
- [self unlockFocus];
}
@end
Modified: trunk/Sources/Views/PointView.m
===================================================================
--- trunk/Sources/Views/PointView.m 2006-10-25 19:17:20 UTC (rev 216)
+++ trunk/Sources/Views/PointView.m 2006-11-12 05:39:33 UTC (rev 217)
@@ -183,7 +183,7 @@
[self setImage:_currImg[scale]];
}
[[WaveHelper mapView] setNeedsDisplayInMoveRect:_frame];
- NSDate * test = [NSDate dateWithTimeIntervalSinceNow:0.1];
+ NSDate * test = [[NSDate dateWithTimeIntervalSinceNow:0.1] retain];
[NSThread sleepUntilDate: test];
[test release];
}
Other related posts:
- » [kismac] [binaervarianz] r217 - in trunk/Sources: Core Support Views Views/GPSSatInfo
