diff options
| -rw-r--r-- | AppKit/GTMNSBezierPath+Shading.m | 2 | ||||
| -rw-r--r-- | Foundation/GTMBase64.m | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/AppKit/GTMNSBezierPath+Shading.m b/AppKit/GTMNSBezierPath+Shading.m index d4c1ddd..fa72849 100644 --- a/AppKit/GTMNSBezierPath+Shading.m +++ b/AppKit/GTMNSBezierPath+Shading.m @@ -129,7 +129,7 @@ - (NSPoint)gtm_projectLineFrom:(NSPoint)pointA to:(NSPoint)pointB by:(CGFloat)length { - NSPoint newPoint = pointB; + NSPoint newPoint = NSMakePoint(pointB.x, pointB.y); CGFloat x = (pointB.x - pointA.x); CGFloat y = (pointB.y - pointA.y); if (fpclassify(x) == FP_ZERO) { diff --git a/Foundation/GTMBase64.m b/Foundation/GTMBase64.m index 9f9ffbf..7c4c68c 100644 --- a/Foundation/GTMBase64.m +++ b/Foundation/GTMBase64.m @@ -526,9 +526,8 @@ GTM_INLINE NSUInteger GuessDecodedLength(NSUInteger srcLen) { curDest[0] = charset[curSrc[0] >> 2]; curDest[1] = charset[(curSrc[0] & 0x03) << 4]; curDest += 2; - destLen -= 2; if (padded) { - _GTMDevAssert(destLen >= 2, @"our calc for encoded length was wrong"); + _GTMDevAssert(destLen >= 4, @"our calc for encoded length was wrong"); curDest[0] = kBase64PaddingChar; curDest[1] = kBase64PaddingChar; curDest += 2; @@ -542,9 +541,8 @@ GTM_INLINE NSUInteger GuessDecodedLength(NSUInteger srcLen) { curDest[1] = charset[((curSrc[0] & 0x03) << 4) + (curSrc[1] >> 4)]; curDest[2] = charset[(curSrc[1] & 0x0f) << 2]; curDest += 3; - destLen -= 3; if (padded) { - _GTMDevAssert(destLen >= 1, @"our calc for encoded length was wrong"); + _GTMDevAssert(destLen >= 4, @"our calc for encoded length was wrong"); curDest[0] = kBase64PaddingChar; curDest += 1; } |