Revision: 5078
http://skim-app.svn.sourceforge.net/skim-app/?rev=5078&view=rev
Author: hofman
Date: 2008-12-20 17:32:29 +0000 (Sat, 20 Dec 2008)
Log Message:
-----------
convenience class methods to convert to pdf data
Modified Paths:
--------------
trunk/SKConversionProgressController.h
trunk/SKConversionProgressController.m
trunk/SKPDFDocument.m
Modified: trunk/SKConversionProgressController.h
===================================================================
--- trunk/SKConversionProgressController.h 2008-12-20 16:33:22 UTC (rev
5077)
+++ trunk/SKConversionProgressController.h 2008-12-20 17:32:29 UTC (rev
5078)
@@ -43,6 +43,8 @@
IBOutlet NSProgressIndicator *progressBar;
IBOutlet NSTextField *textField;
}
++ (NSData *)PDFDataWithPostScriptData:(NSData *)psData;
++ (NSData *)PDFDataWithDVIFile:(NSString *)dviFile;
- (IBAction)cancel:(id)sender;
- (IBAction)close:(id)sender;
@end
Modified: trunk/SKConversionProgressController.m
===================================================================
--- trunk/SKConversionProgressController.m 2008-12-20 16:33:22 UTC (rev
5077)
+++ trunk/SKConversionProgressController.m 2008-12-20 17:32:29 UTC (rev
5078)
@@ -120,6 +120,16 @@
@implementation SKConversionProgressController
++ (NSData *)PDFDataWithPostScriptData:(NSData *)psData
+{
+ return [[[[SKPSProgressController alloc] init] autorelease]
PDFDataWithPostScriptData:psData];
+}
+
++ (NSData *)PDFDataWithDVIFile:(NSString *)dviFile
+{
+ return [[[[SKDVIProgressController alloc] init] autorelease]
PDFDataWithDVIFile:psData];
+}
+
- (void)awakeFromNib
{
if ([[self window] respondsToSelector:@selector(setCollectionBehavior:)])
Modified: trunk/SKPDFDocument.m
===================================================================
--- trunk/SKPDFDocument.m 2008-12-20 16:33:22 UTC (rev 5077)
+++ trunk/SKPDFDocument.m 2008-12-20 17:32:29 UTC (rev 5078)
@@ -601,10 +601,8 @@
[self setPDFDoc:nil];
[self setNoteDicts:nil];
- if (SKIsPostScriptDocumentType(docType)) {
- SKPSProgressController *psProgressController =
[[[SKPSProgressController alloc] init] autorelease];
- data = [psProgressController PDFDataWithPostScriptData:data];
- }
+ if (SKIsPostScriptDocumentType(docType))
+ data = [SKConversionProgressController PDFDataWithPostScriptData:data];
if (data)
pdfDoc = [[PDFDocument alloc] initWithData:data];
@@ -712,17 +710,13 @@
}
} else if (SKIsPostScriptDocumentType(docType)) {
if (data = [NSData dataWithContentsOfURL:absoluteURL
options:NSUncachedRead error:&error]) {
- SKPSProgressController *psProgressController =
[[SKPSProgressController alloc] init];
- if (data = [[psProgressController PDFDataWithPostScriptData:data]
retain])
+ if (data = [[SKConversionProgressController
PDFDataWithPostScriptData:data] retain])
pdfDoc = [[PDFDocument alloc] initWithData:data];
- [psProgressController autorelease];
}
} else if (SKIsDVIDocumentType(docType)) {
if (data = [NSData dataWithContentsOfURL:absoluteURL
options:NSUncachedRead error:&error]) {
- SKDVIProgressController *dviProgressController =
[[SKDVIProgressController alloc] init];
- if (data = [[dviProgressController PDFDataWithDVIFile:[absoluteURL
path]] retain])
+ if (data = [[SKConversionProgressController
PDFDataWithDVIFile:[absoluteURL path]] retain])
pdfDoc = [[PDFDocument alloc] initWithData:data];
- [dviProgressController autorelease];
}
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
