Revision: 7405
http://skim-app.svn.sourceforge.net/skim-app/?rev=7405&view=rev
Author: hofman
Date: 2011-07-30 23:01:41 +0000 (Sat, 30 Jul 2011)
Log Message:
-----------
return converted pdf data retained
Modified Paths:
--------------
trunk/SKConversionProgressController.h
trunk/SKConversionProgressController.m
trunk/SKMainDocument.m
Modified: trunk/SKConversionProgressController.h
===================================================================
--- trunk/SKConversionProgressController.h 2011-07-30 10:15:45 UTC (rev
7404)
+++ trunk/SKConversionProgressController.h 2011-07-30 23:01:41 UTC (rev
7405)
@@ -53,9 +53,9 @@
@property (nonatomic, retain) IBOutlet NSProgressIndicator *progressBar;
@property (nonatomic, retain) IBOutlet NSTextField *textField;
-+ (NSData *)PDFDataWithPostScriptData:(NSData *)psData error:(NSError
**)outError;
-+ (NSData *)PDFDataWithDVIFile:(NSString *)dviFile error:(NSError **)outError;
-+ (NSData *)PDFDataWithXDVFile:(NSString *)xdvFile error:(NSError **)outError;
++ (NSData *)newPDFDataWithPostScriptData:(NSData *)psData error:(NSError
**)outError;
++ (NSData *)newPDFDataWithDVIFile:(NSString *)dviFile error:(NSError
**)outError;
++ (NSData *)newPDFDataWithXDVFile:(NSString *)xdvFile error:(NSError
**)outError;
- (IBAction)cancel:(id)sender;
- (IBAction)close:(id)sender;
Modified: trunk/SKConversionProgressController.m
===================================================================
--- trunk/SKConversionProgressController.m 2011-07-30 10:15:45 UTC (rev
7404)
+++ trunk/SKConversionProgressController.m 2011-07-30 23:01:41 UTC (rev
7405)
@@ -67,8 +67,8 @@
@interface SKConversionProgressController (Private)
+ (NSString *)dviToolPath;
+ (NSString *)xdvToolPath;
-- (NSData *)PDFDataWithPostScriptData:(NSData *)psData error:(NSError
**)outError;
-- (NSData *)PDFDataWithDVIFile:(NSString *)dviFile toolPath:(NSString
*)toolPath fileType:(NSString *)aFileType error:(NSError **)outError;
+- (NSData *)newPDFDataWithPostScriptData:(NSData *)psData error:(NSError
**)outError;
+- (NSData *)newPDFDataWithDVIFile:(NSString *)dviFile toolPath:(NSString
*)toolPath fileType:(NSString *)aFileType error:(NSError **)outError;
- (void)conversionCompleted:(BOOL)didComplete;
- (void)conversionStarted;
- (void)converterWasStopped;
@@ -111,23 +111,23 @@
@synthesize cancelButton, progressBar, textField;
-+ (NSData *)PDFDataWithPostScriptData:(NSData *)psData error:(NSError
**)outError {
- return [[[[self alloc] init] autorelease] PDFDataWithPostScriptData:psData
error:outError];
++ (NSData *)newPDFDataWithPostScriptData:(NSData *)psData error:(NSError
**)outError {
+ return [[[[self alloc] init] autorelease]
newPDFDataWithPostScriptData:psData error:outError];
}
-+ (NSData *)PDFDataWithDVIFile:(NSString *)dviFile error:(NSError **)outError {
++ (NSData *)newPDFDataWithDVIFile:(NSString *)dviFile error:(NSError
**)outError {
NSString *dviToolPath = [self dviToolPath];
if (dviToolPath)
- return [[[[self alloc] init] autorelease] PDFDataWithDVIFile:dviFile
toolPath:dviToolPath fileType:SKDVIDocumentType error:outError];
+ return [[[[self alloc] init] autorelease]
newPDFDataWithDVIFile:dviFile toolPath:dviToolPath fileType:SKDVIDocumentType
error:outError];
else
NSBeep();
return nil;
}
-+ (NSData *)PDFDataWithXDVFile:(NSString *)xdvFile error:(NSError **)outError {
++ (NSData *)newPDFDataWithXDVFile:(NSString *)xdvFile error:(NSError
**)outError {
NSString *xdvToolPath = [self xdvToolPath];
if (xdvToolPath)
- return [[[[self alloc] init] autorelease] PDFDataWithDVIFile:xdvFile
toolPath:xdvToolPath fileType:SKXDVDocumentType error:outError];
+ return [[[[self alloc] init] autorelease]
newPDFDataWithDVIFile:xdvFile toolPath:xdvToolPath fileType:SKXDVDocumentType
error:outError];
else
NSBeep();
return nil;
@@ -240,7 +240,7 @@
[pool release];
}
-- (NSData *)PDFDataWithPostScriptData:(NSData *)psData error:(NSError
**)outError {
+- (NSData *)newPDFDataWithPostScriptData:(NSData *)psData error:(NSError
**)outError {
NSAssert(NULL == converter, @"attempted to reenter
SKConversionProgressController, but this is not supported");
fileType = SKPostScriptDocumentType;
@@ -274,7 +274,7 @@
}
}
- return [(id)pdfData autorelease];
+ return (NSData *)pdfData;
}
#pragma mark DVI and XDV
@@ -385,7 +385,7 @@
[pool release];
}
-- (NSData *)PDFDataWithDVIFile:(NSString *)dviFile toolPath:(NSString
*)toolPath fileType:(NSString *)aFileType error:(NSError **)outError {
+- (NSData *)newPDFDataWithDVIFile:(NSString *)dviFile toolPath:(NSString
*)toolPath fileType:(NSString *)aFileType error:(NSError **)outError {
NSAssert(NULL == converter, @"attempted to reenter
SKConversionProgressController, but this is not supported");
NSMutableData *pdfData = nil;
@@ -415,7 +415,7 @@
}
}
- return [pdfData autorelease];
+ return pdfData;
}
@end
Modified: trunk/SKMainDocument.m
===================================================================
--- trunk/SKMainDocument.m 2011-07-30 10:15:45 UTC (rev 7404)
+++ trunk/SKMainDocument.m 2011-07-30 23:01:41 UTC (rev 7405)
@@ -681,7 +681,7 @@
if ([docType isEqualToString:SKPostScriptDocumentType]) {
[self setPSOrDVIData:data];
- data = [SKConversionProgressController PDFDataWithPostScriptData:data
error:&error];
+ data = [[SKConversionProgressController
newPDFDataWithPostScriptData:data error:&error] autorelease];
}
if (data)
@@ -750,13 +750,13 @@
if ((data = [fileData retain]))
pdfDoc = [[SKPDFDocument alloc] initWithURL:absoluteURL];
} else if ([docType isEqualToString:SKPostScriptDocumentType]) {
- if ((data = [[SKConversionProgressController
PDFDataWithPostScriptData:fileData error:&error] retain]))
+ if ((data = [SKConversionProgressController
newPDFDataWithPostScriptData:fileData error:&error]))
pdfDoc = [[SKPDFDocument alloc] initWithData:data];
} else if ([docType isEqualToString:SKDVIDocumentType]) {
- if ((data = [[SKConversionProgressController
PDFDataWithDVIFile:[absoluteURL path] error:&error] retain]))
+ if ((data = [SKConversionProgressController
newPDFDataWithDVIFile:[absoluteURL path] error:&error]))
pdfDoc = [[SKPDFDocument alloc] initWithData:data];
} else if ([docType isEqualToString:SKXDVDocumentType]) {
- if ((data = [[SKConversionProgressController
PDFDataWithXDVFile:[absoluteURL path] error:&error] retain]))
+ if ((data = [SKConversionProgressController
newPDFDataWithXDVFile:[absoluteURL path] error:&error]))
pdfDoc = [[SKPDFDocument alloc] initWithData:data];
}
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Got Input? Slashdot Needs You.
Take our quick survey online. Come on, we don't ask for help often.
Plus, you'll get a chance to win $100 to spend on ThinkGeek.
http://p.sf.net/sfu/slashdot-survey
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
