Revision: 3681
          http://skim-app.svn.sourceforge.net/skim-app/?rev=3681&view=rev
Author:   hofman
Date:     2008-04-08 14:22:58 -0700 (Tue, 08 Apr 2008)

Log Message:
-----------
rename global FDF string constants.

Modified Paths:
--------------
    trunk/PDFAnnotation_SKExtensions.m
    trunk/SKFDFParser.h
    trunk/SKFDFParser.m

Modified: trunk/PDFAnnotation_SKExtensions.m
===================================================================
--- trunk/PDFAnnotation_SKExtensions.m  2008-04-08 20:27:15 UTC (rev 3680)
+++ trunk/PDFAnnotation_SKExtensions.m  2008-04-08 21:22:58 UTC (rev 3681)
@@ -189,8 +189,8 @@
     [[self color] getRed:&r green:&g blue:&b alpha:&a];
     [fdfString appendFormat:@"/%s/%s/%s/", SKFDFTypeKey, SKFDFAnnotation, 
SKFDFAnnotationTypeKey];
     [fdfString appendString:[[self type] isEqualToString:SKNoteString] ? 
SKTextString : [self type]];
-    [fdfString appendFormat:@"/%s[%f %f %f %f]", SKFDFAnnotationRectKey, 
NSMinX(bounds), NSMinY(bounds), NSMaxX(bounds), NSMaxY(bounds)];
-    [fdfString appendFormat:@"/%s %i", SKFDFAnnotationPageKey, [self 
pageIndex]];
+    [fdfString appendFormat:@"/%s[%f %f %f %f]", SKFDFAnnotationBoundsKey, 
NSMinX(bounds), NSMinY(bounds), NSMaxX(bounds), NSMaxY(bounds)];
+    [fdfString appendFormat:@"/%s %i", SKFDFAnnotationPageIndexKey, [self 
pageIndex]];
     [fdfString appendFormat:@"/%s 4", SKFDFAnnotationFlagsKey];
     if (a > 0.0)
         [fdfString appendFormat:@"/%s[%f %f %f]", SKFDFAnnotationColorKey, r, 
g, b];

Modified: trunk/SKFDFParser.h
===================================================================
--- trunk/SKFDFParser.h 2008-04-08 20:27:15 UTC (rev 3680)
+++ trunk/SKFDFParser.h 2008-04-08 21:22:58 UTC (rev 3681)
@@ -48,10 +48,9 @@
 
 extern const char *SKFDFAnnotationFlagsKey;
 extern const char *SKFDFAnnotationTypeKey;
-extern const char *SKFDFAnnotationRectKey;
-extern const char *SKFDFAnnotationContentsKey;
 extern const char *SKFDFAnnotationBoundsKey;
-extern const char *SKFDFAnnotationPageKey;
+extern const char *SKFDFAnnotationPageIndexKey;
+extern const char *SKFDFAnnotationContentsKey;
 extern const char *SKFDFAnnotationColorKey;
 extern const char *SKFDFAnnotationInteriorColorKey;
 extern const char *SKFDFAnnotationBorderStylesKey;

Modified: trunk/SKFDFParser.m
===================================================================
--- trunk/SKFDFParser.m 2008-04-08 20:27:15 UTC (rev 3680)
+++ trunk/SKFDFParser.m 2008-04-08 21:22:58 UTC (rev 3681)
@@ -61,10 +61,9 @@
 
 const char *SKFDFAnnotationFlagsKey = "F";
 const char *SKFDFAnnotationTypeKey = "Subtype";
-const char *SKFDFAnnotationRectKey = "Rect";
+const char *SKFDFAnnotationBoundsKey = "Rect";
+const char *SKFDFAnnotationPageIndexKey = "Page";
 const char *SKFDFAnnotationContentsKey = "Contents";
-const char *SKFDFAnnotationBoundsKey = "Bounds";
-const char *SKFDFAnnotationPageKey = "Page";
 const char *SKFDFAnnotationColorKey = "C";
 const char *SKFDFAnnotationInteriorColorKey = "IC";
 const char *SKFDFAnnotationBorderStylesKey = "BS";
@@ -88,7 +87,7 @@
 const char *SKFDFBorderStyleUnderline = "U";
 
 const char *SKFDFTextAnnotationIconComment = "Comment";
-const char *SKFDFTextAnnotationIconKey = "";
+const char *SKFDFTextAnnotationIconKey = "Key";
 const char *SKFDFTextAnnotationIconNote = "Note";
 const char *SKFDFTextAnnotationIconNewParagraph = "NewParagraph";
 const char *SKFDFTextAnnotationIconParagraph = "Paragraph";
@@ -177,7 +176,7 @@
         success = NO;
     }
     
-    if (CGPDFDictionaryGetArray(annot, SKFDFAnnotationRectKey, &array)) {
+    if (CGPDFDictionaryGetArray(annot, SKFDFAnnotationBoundsKey, &array)) {
         CGPDFReal l, b, r, t;
         if (CGPDFArrayGetCount(array) == 4 && CGPDFArrayGetNumber(array, 0, 
&l) && CGPDFArrayGetNumber(array, 1, &b) && CGPDFArrayGetNumber(array, 2, &r) 
&& CGPDFArrayGetNumber(array, 3, &t)) {
             bounds = NSMakeRect(l, b, r - l, t - b);
@@ -187,7 +186,7 @@
         success = NO;
     }
     
-    if (CGPDFDictionaryGetInteger(annot, SKFDFAnnotationPageKey, &integer)) {
+    if (CGPDFDictionaryGetInteger(annot, SKFDFAnnotationPageIndexKey, 
&integer)) {
         [dictionary setObject:[NSNumber numberWithInt:integer] 
forKey:SKPDFAnnotationPageIndexKey];
     } else {
         success = NO;


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

-------------------------------------------------------------------------
This SF.net email is sponsored by the 2008 JavaOne(SM) Conference 
Register now and save $200. Hurry, offer ends at 11:59 p.m., 
Monday, April 7! Use priority code J8TLD2. 
http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit

Reply via email to