Revision: 5868
http://skim-app.svn.sourceforge.net/skim-app/?rev=5868&view=rev
Author: hofman
Date: 2009-10-12 16:53:37 +0000 (Mon, 12 Oct 2009)
Log Message:
-----------
use data search method from 10.6 when available, and provide our own
implementation on 10.5
Modified Paths:
--------------
trunk/NSData_SKExtensions.h
trunk/NSData_SKExtensions.m
trunk/SKMainDocument.m
Modified: trunk/NSData_SKExtensions.h
===================================================================
--- trunk/NSData_SKExtensions.h 2009-10-12 11:48:15 UTC (rev 5867)
+++ trunk/NSData_SKExtensions.h 2009-10-12 16:53:37 UTC (rev 5868)
@@ -41,10 +41,6 @@
@interface NSData (SKExtensions)
-- (NSUInteger)indexOfBytes:(const void *)patternBytes
length:(NSUInteger)patternLength;
-- (NSUInteger)indexOfBytes:(const void *)patternBytes
length:(NSUInteger)patternLength options:(NSInteger)mask;
-- (NSUInteger)indexOfBytes:(const void *)patternBytes
length:(NSUInteger)patternLength options:(NSInteger)mask
range:(NSRange)searchRange;
-
- (NSData *)md5Signature;
- (NSString *)hexString;
- (NSString *)xmlString;
@@ -64,3 +60,15 @@
- (id)scriptingTiffPictureDescriptor;
@end
+
+#if MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_5
+enum {
+ NSDataSearchBackwards = 1UL << 0,
+ NSDataSearchAnchored = 1UL << 1
+};
+typedef NSUInteger NSDataSearchOptions;
+
+...@interface NSData (SKSnowLeopardExtensions)
+- (NSRange)rangeOfData:(NSData *)dataToFind options:(NSDataSearchOptions)mask
range:(NSRange)searchRange;
+...@end
+#endif
Modified: trunk/NSData_SKExtensions.m
===================================================================
--- trunk/NSData_SKExtensions.m 2009-10-12 11:48:15 UTC (rev 5867)
+++ trunk/NSData_SKExtensions.m 2009-10-12 16:53:37 UTC (rev 5868)
@@ -38,33 +38,29 @@
#import "NSData_SKExtensions.h"
#import "NSGeometry_SKExtensions.h"
+#import "SKRuntime.h"
#import <openssl/bio.h>
#import <openssl/evp.h>
@implementation NSData (SKExtensions)
-- (NSUInteger)indexOfBytes:(const void *)patternBytes
length:(NSUInteger)patternLength {
- return [self indexOfBytes:patternBytes length:patternLength options:0
range:NSMakeRange(0, [self length])];
-}
-
-- (NSUInteger)indexOfBytes:(const void *)patternBytes
length:(NSUInteger)patternLength options:(NSInteger)mask {
- return [self indexOfBytes:patternBytes length:patternLength options:mask
range:NSMakeRange(0, [self length])];
-}
-
-- (NSUInteger)indexOfBytes:(const void *)patternBytes
length:(NSUInteger)patternLength options:(NSInteger)mask
range:(NSRange)searchRange {
+- (NSRange)Leopard_rangeOfData:(NSData *)dataToFind
options:(NSDataSearchOptions)mask range:(NSRange)searchRange {
+ NSUInteger patternLength = [dataToFind length];
NSUInteger selfLength = [self length];
if (searchRange.location > selfLength || NSMaxRange(searchRange) >
selfLength)
[NSException raise:NSRangeException format:@"Range {%lu,%lu} exceeds
length %lu", (unsigned long)searchRange.location, (unsigned
long)searchRange.length, (unsigned long)selfLength];
+ const void *patternBytes = [dataToFind bytes];
const unsigned char *selfBufferStart, *selfPtr, *selfPtrEnd, *selfPtrMax;
const unsigned char firstPatternByte = *(const char *)patternBytes;
- BOOL backward = (mask & NSBackwardsSearch) != 0;
+ BOOL backward = (mask & NSDataSearchBackwards) != 0;
+ BOOL anchored = (mask & NSDataSearchAnchored) != 0;
if (patternLength == 0)
- return searchRange.location;
+ return NSMakeRange(searchRange.location, 0);
if (patternLength > searchRange.length) {
// This test is a nice shortcut, but it's also necessary to avoid
crashing: zero-length CFDatas will sometimes(?) return NULL for their bytes
pointer, and the resulting pointer arithmetic can underflow.
- return NSNotFound;
+ return NSMakeRange(NSNotFound, 0);
}
selfBufferStart = [self bytes];
@@ -79,8 +75,11 @@
for (;;) {
if (memcmp(selfPtr, patternBytes, patternLength) == 0)
- return (selfPtr - selfBufferStart);
+ return NSMakeRange(selfPtr - selfBufferStart, 0);
+ if (anchored)
+ break;
+
if (backward) {
do {
selfPtr--;
@@ -96,7 +95,7 @@
break;
}
}
- return NSNotFound;
+ return NSMakeRange(NSNotFound, 0);
}
- (NSData *)md5Signature {
@@ -251,4 +250,8 @@
return [NSAppleEventDescriptor descriptorWithDescriptorType:'TIFF'
data:self];
}
++ (void)load {
+ SKAddInstanceMethodImplementationFromSelector(self,
@selector(rangeOfData:options:range:),
@selector(Leopard_rangeOfData:options:range:));
+}
+
@end
Modified: trunk/SKMainDocument.m
===================================================================
--- trunk/SKMainDocument.m 2009-10-12 11:48:15 UTC (rev 5867)
+++ trunk/SKMainDocument.m 2009-10-12 16:53:37 UTC (rev 5868)
@@ -1375,13 +1375,14 @@
[fh seekToFileOffset:startPos];
NSData *trailerData = [fh readDataToEndOfFile];
NSRange range = NSMakeRange(0, [trailerData length]);
- const char *pattern = "%%EOF";
+ NSData *pattern = [@"%%EOF" dataUsingEncoding:NSISOLatin1StringEncoding];
+ NSDataSearchOptions options = NSDataSearchBackwards;
if (isDVI) {
- pattern = [[NSString stringWithFormat:@"%C%C%C%C", 0xFB02, 0xFB02,
0xFB02, 0xFB02] cStringUsingEncoding:NSMacOSRomanStringEncoding];
- range = NSMakeRange(strlen(pattern), [trailerData length] -
strlen(pattern));
+ pattern = [[NSString stringWithFormat:@"%C%C%C%C", 0xFB02, 0xFB02,
0xFB02, 0xFB02] dataUsingEncoding:NSMacOSRomanStringEncoding];
+ options |= NSDataSearchAnchored;
}
- return NSNotFound != [trailerData indexOfBytes:pattern
length:strlen(pattern) options:NSBackwardsSearch range:range];
+ return NSNotFound != [trailerData rangeOfData:pattern options:options
range:range].location;
}
- (void)fileUpdated {
@@ -1661,18 +1662,18 @@
- (NSArray *)fileIDStrings {
if (pdfData == nil)
return nil;
- const char *EOFPattern = "%%EOF";
- const char *trailerPattern = "trailer";
- const char *IDPattern = "/ID";
- const char *startArrayPattern = "[";
- const char *endArrayPattern = "]";
- const char *startStringPattern = "<";
- const char *endStringPattern = ">";
- NSUInteger patternLength = strlen(EOFPattern);
+ NSData *EOFPattern = [@"%%EOF"
dataUsingEncoding:NSISOLatin1StringEncoding];
+ NSData *trailerPattern = [@"trailer"
dataUsingEncoding:NSISOLatin1StringEncoding];
+ NSData *IDPattern = [@"/ID" dataUsingEncoding:NSISOLatin1StringEncoding];
+ NSData *startArrayPattern = [@"["
dataUsingEncoding:NSISOLatin1StringEncoding];
+ NSData *endArrayPattern = [@"]"
dataUsingEncoding:NSISOLatin1StringEncoding];
+ NSData *startStringPattern = [@"<"
dataUsingEncoding:NSISOLatin1StringEncoding];
+ NSData *endStringPattern = [@">"
dataUsingEncoding:NSISOLatin1StringEncoding];
+ NSUInteger patternLength = [EOFPattern length];
NSRange range = NSMakeRange([pdfData length] - 1024, 1024);
if (range.location < 0)
range = NSMakeRange(0, [pdfData length]);
- NSUInteger EOFIndex = [pdfData indexOfBytes:EOFPattern
length:patternLength options:NSBackwardsSearch range:range];
+ NSUInteger EOFIndex = [pdfData rangeOfData:EOFPattern
options:NSDataSearchBackwards range:range].location;
NSUInteger trailerIndex, IDIndex, startArrayIndex, endArrayIndex,
startStringIndex, endStringIndex;
NSData *firstIDData = nil;
NSData *secondIDData = nil;
@@ -1681,37 +1682,37 @@
range = NSMakeRange(EOFIndex - 2048, 2048);
if (range.location < 0)
range = NSMakeRange(0, EOFIndex);
- patternLength = strlen(trailerPattern);
- trailerIndex = [pdfData indexOfBytes:trailerPattern
length:patternLength options:NSBackwardsSearch range:range];
+ patternLength = [trailerPattern length];
+ trailerIndex = [pdfData rangeOfData:trailerPattern
options:NSDataSearchBackwards range:range].location;
if (trailerIndex != NSNotFound) {
range = NSMakeRange(trailerIndex + patternLength, EOFIndex -
trailerIndex - patternLength);
- patternLength = strlen(IDPattern);
- IDIndex = [pdfData indexOfBytes:IDPattern length:patternLength
options:0 range:range];
+ patternLength = [IDPattern length];
+ IDIndex = [pdfData rangeOfData:IDPattern options:0
range:range].location;
if (IDIndex != NSNotFound) {
range = NSMakeRange(IDIndex + patternLength, EOFIndex -
IDIndex - patternLength);
- patternLength = strlen(startArrayPattern);
- startArrayIndex = [pdfData indexOfBytes:startArrayPattern
length:patternLength options:0 range:range];
+ patternLength = [startArrayPattern length];
+ startArrayIndex = [pdfData rangeOfData:startArrayPattern
options:0 range:range].location;
if (startArrayIndex != NSNotFound) {
range = NSMakeRange(startArrayIndex + patternLength,
EOFIndex - startArrayIndex - patternLength);
- patternLength = strlen(endArrayPattern);
- endArrayIndex = [pdfData indexOfBytes:endArrayPattern
length:patternLength options:0 range:range];
+ patternLength = [endArrayPattern length];
+ endArrayIndex = [pdfData rangeOfData:endArrayPattern
options:0 range:range].location;
if (endArrayIndex != NSNotFound) {
range = NSMakeRange(startArrayIndex + 1, endArrayIndex
- startArrayIndex - 1);
- patternLength = strlen(startStringPattern);
- startStringIndex = [pdfData
indexOfBytes:startStringPattern length:patternLength options:0 range:range];
+ patternLength = [startStringPattern length];
+ startStringIndex = [pdfData
rangeOfData:startStringPattern options:0 range:range].location;
if (startStringIndex != NSNotFound) {
range = NSMakeRange(startStringIndex +
patternLength, endArrayIndex - startStringIndex - patternLength);
- patternLength = strlen(endStringPattern);
- endStringIndex = [pdfData
indexOfBytes:endStringPattern length:patternLength options:0 range:range];
+ patternLength = [endStringPattern length];
+ endStringIndex = [pdfData
rangeOfData:endStringPattern options:0 range:range].location;
if (endStringIndex != NSNotFound) {
if (firstIDData = [pdfData
subdataWithRange:NSMakeRange(startStringIndex + 1, endStringIndex -
startStringIndex - 1)]) {
range = NSMakeRange(endStringIndex +
patternLength, endArrayIndex - endStringIndex - patternLength);
- patternLength = strlen(startStringPattern);
- startStringIndex = [pdfData
indexOfBytes:startStringPattern length:patternLength options:0 range:range];
+ patternLength = [startStringPattern
length];
+ startStringIndex = [pdfData
rangeOfData:startStringPattern options:0 range:range].location;
if (startStringIndex != NSNotFound) {
range = NSMakeRange(startStringIndex +
patternLength, endArrayIndex - startStringIndex - patternLength);
- patternLength =
strlen(endStringPattern);
- endStringIndex = [pdfData
indexOfBytes:endStringPattern length:patternLength options:0 range:range];
+ patternLength = [endStringPattern
length];
+ endStringIndex = [pdfData
rangeOfData:endStringPattern options:0 range:range].location;
if (endStringIndex != NSNotFound) {
secondIDData = [pdfData
subdataWithRange:NSMakeRange(startStringIndex + 1, endStringIndex -
startStringIndex - 1)];
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Come build with us! The BlackBerry(R) Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay
ahead of the curve. Join us from November 9 - 12, 2009. Register now!
http://p.sf.net/sfu/devconference
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit