Revision: 13856
http://sourceforge.net/p/skim-app/code/13856
Author: hofman
Date: 2023-12-08 15:27:01 +0000 (Fri, 08 Dec 2023)
Log Message:
-----------
Fix precompile statments and returns in iOS code
Modified Paths:
--------------
trunk/SkimNotes/PDFAnnotation_SKNExtensions.m
trunk/SkimNotes/PDFDocument_SKNExtensions.m
trunk/SkimNotes/SKNPDFAnnotationNote.m
trunk/SkimNotes/SKNUtilities.m
Modified: trunk/SkimNotes/PDFAnnotation_SKNExtensions.m
===================================================================
--- trunk/SkimNotes/PDFAnnotation_SKNExtensions.m 2023-12-08 10:02:59 UTC
(rev 13855)
+++ trunk/SkimNotes/PDFAnnotation_SKNExtensions.m 2023-12-08 15:27:01 UTC
(rev 13856)
@@ -237,7 +237,7 @@
if ([type isEqualToString:SKNNoteString] || [type
isEqualToString:SKNTextString]) {
if ([self isMemberOfClass:[PDFAnnotation class]]) {
// replace by our subclass
- [self init];
+ self = [self init];
self = [[SKNPDFAnnotationNote alloc] initSkimNoteWithBounds:bounds
forType:type];
return self;
} else if ([self isKindOfClass:[SKNPDFAnnotationNote class]]) {
@@ -317,7 +317,7 @@
if (([type isEqualToString:SKNNoteString] || [type
isEqualToString:SKNTextString]) && [self isMemberOfClass:[PDFAnnotation
class]]) {
// replace by our subclass
- [self init];
+ self = [self init];
self = [[SKNPDFAnnotationNote alloc] initSkimNoteWithProperties:dict];
return self;
}
Modified: trunk/SkimNotes/PDFDocument_SKNExtensions.m
===================================================================
--- trunk/SkimNotes/PDFDocument_SKNExtensions.m 2023-12-08 10:02:59 UTC (rev
13855)
+++ trunk/SkimNotes/PDFDocument_SKNExtensions.m 2023-12-08 15:27:01 UTC (rev
13856)
@@ -40,6 +40,7 @@
#import "PDFAnnotation_SKNExtensions.h"
#import "SKNPDFAnnotationNote.h"
#import "NSFileManager_SKNExtensions.h"
+#import "SKNDefines.h"
#if defined(PDFKIT_PLATFORM_IOS)
@@ -57,9 +58,6 @@
#define SKNRectFromString(string) NSRectFromString(string)
#define SKNEqualRects(rect1, rect2) NSEqualRects(NSIntegralRect(rect1),
NSIntegralRect(rect2))
-#define PDF_EXTENSION @"pdf"
-#define PDFD_EXTENSION @"pdfd"
-
#if !defined(MAC_OS_X_VERSION_10_12) || MAC_OS_X_VERSION_MAX_ALLOWED <
MAC_OS_X_VERSION_10_12
@interface PDFAnnotation (SKNSierraDeclarations)
- (id)valueForAnnotationKey:(NSString *)key;
Modified: trunk/SkimNotes/SKNPDFAnnotationNote.m
===================================================================
--- trunk/SkimNotes/SKNPDFAnnotationNote.m 2023-12-08 10:02:59 UTC (rev
13855)
+++ trunk/SkimNotes/SKNPDFAnnotationNote.m 2023-12-08 15:27:01 UTC (rev
13856)
@@ -86,8 +86,10 @@
@synthesize string = _string;
@synthesize text = _text;
@dynamic image;
+#if !defined(PDFKIT_PLATFORM_IOS)
@dynamic mutableText;
@synthesize texts = _texts;
+#endif
- (void)updateContents {
NSMutableString *contents = [NSMutableString string];
Modified: trunk/SkimNotes/SKNUtilities.m
===================================================================
--- trunk/SkimNotes/SKNUtilities.m 2023-12-08 10:02:59 UTC (rev 13855)
+++ trunk/SkimNotes/SKNUtilities.m 2023-12-08 15:27:01 UTC (rev 13856)
@@ -322,7 +322,7 @@
}
if ((value = [dict objectForKey:NOTE_TEXT_KEY])) {
if ([value isKindOfClass:[NSAttributedString class]]) {
-#if !defined(PDFKIT_PLATFORM_IOS) && (!defined(MAC_OS_X_VERSION_10_11) ||
MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_11)
+#if !defined(SKIMNOTES_PLATFORM_IOS) && (!defined(MAC_OS_X_VERSION_10_11) ||
MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_11)
if ([value containsAttachments]) {
#else
if ([value containsAttachmentsInRange:NSMakeRange(0, [value
length])]) {
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
