Revision: 4189
          http://skim-app.svn.sourceforge.net/skim-app/?rev=4189&view=rev
Author:   hofman
Date:     2008-07-11 05:28:24 -0700 (Fri, 11 Jul 2008)

Log Message:
-----------
Pass PDF file name to synchronizer. Avoid a leak in the synchronizer and some 
simplifications.

Modified Paths:
--------------
    trunk/SKPDFDocument.m
    trunk/SKPDFSynchronizer.m

Modified: trunk/SKPDFDocument.m
===================================================================
--- trunk/SKPDFDocument.m       2008-07-11 11:32:35 UTC (rev 4188)
+++ trunk/SKPDFDocument.m       2008-07-11 12:28:24 UTC (rev 4189)
@@ -1386,7 +1386,7 @@
         [self stopCheckingFileUpdates];
     [super setFileURL:absoluteURL];
     if ([absoluteURL isFileURL])
-        [synchronizer setFileName:[[absoluteURL path] 
stringByReplacingPathExtension:@"pdfsync"]];
+        [synchronizer setFileName:[absoluteURL path]];
     else
         [synchronizer setFileName:nil];
     // if we're saving this will be called when saving has finished
@@ -1398,7 +1398,7 @@
     if (synchronizer == nil) {
         synchronizer = [[SKPDFSynchronizer alloc] init];
         [synchronizer setDelegate:self];
-        [synchronizer setFileName:[[self fileName] 
stringByReplacingPathExtension:@"pdfsync"]];
+        [synchronizer setFileName:[self fileName]];
     }
     return synchronizer;
 }

Modified: trunk/SKPDFSynchronizer.m
===================================================================
--- trunk/SKPDFSynchronizer.m   2008-07-11 11:32:35 UTC (rev 4188)
+++ trunk/SKPDFSynchronizer.m   2008-07-11 12:28:24 UTC (rev 4189)
@@ -41,6 +41,7 @@
 #import "NSScanner_SKExtensions.h"
 #import <Carbon/Carbon.h>
 #import "Files_SKExtensions.h"
+#import "NSString_SKExtensions.h"
 
 #define SYNC_TO_PDF(coord) ((float)coord / 65536.0)
 #define PDF_TO_SYNC(coord) (int)(coord * 65536.0)
@@ -454,8 +455,7 @@
     if (scanner)
         synctex_scanner_free(scanner);
     if (scanner = synctex_scanner_new_with_output_file([theFileName 
fileSystemRepresentation])) {
-        NSString *theSyncFileName = 
SKPathFromFileSystemRepresentation(synctex_scanner_get_synctex(scanner));
-        [self setSyncFileName:theSyncFileName];
+        [self 
setSyncFileName:SKPathFromFileSystemRepresentation(synctex_scanner_get_synctex(scanner))];
         isPdfsync = NO;
         return YES;
     }
@@ -481,7 +481,7 @@
             return YES;
     }
     
-    theSyncFileName = [[theFileName stringByDeletingPathExtension] 
stringByAppendingPathExtension:SKPDFSynchronizerPdfsyncExtension];
+    theSyncFileName = [theFileName 
stringByReplacingPathExtension:SKPDFSynchronizerPdfsyncExtension];
     
     if (SKFileExistsAtPath(theSyncFileName))
         return [self parsePdfsyncFile:theSyncFileName];
@@ -606,7 +606,7 @@
         synctex_node_t node;
         if (node = synctex_next_result(scanner)) {
             *line = synctex_node_line(node);
-            *file = 
[SKPathFromFileSystemRepresentation(synctex_scanner_get_name(scanner, 
synctex_node_tag(node))) retain];
+            *file = 
SKPathFromFileSystemRepresentation(synctex_scanner_get_name(scanner, 
synctex_node_tag(node)));
             return YES;
         }
     }


This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.

-------------------------------------------------------------------------
Sponsored by: SourceForge.net Community Choice Awards: VOTE NOW!
Studies have shown that voting for your favorite open source project,
along with a healthy diet, reduces your potential for chronic lameness
and boredom. Vote Now at http://www.sourceforge.net/community/cca08
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit

Reply via email to