[Skim-app-commit] SF.net SVN: skim-app:[12795] trunk

[hofman--- via Skim-app-commit]

Revision: 12795
          http://sourceforge.net/p/skim-app/code/12795
Author:   hofman
Date:     2022-02-20 15:19:38 +0000 (Sun, 20 Feb 2022)
Log Message:
-----------
Save colors in preferences using keyed archiver, this allows saving in more 
general color spaces such as sRGB

Modified Paths:
--------------
    trunk/NSUserDefaults_SKExtensions.m
    trunk/NSValueTransformer_SKExtensions.m

Modified: trunk/NSUserDefaults_SKExtensions.m
===================================================================
--- trunk/NSUserDefaults_SKExtensions.m 2022-02-17 14:55:24 UTC (rev 12794)
+++ trunk/NSUserDefaults_SKExtensions.m 2022-02-20 15:19:38 UTC (rev 12795)
@@ -45,10 +45,10 @@
     NSColor *color = nil;
     NSData *data = [self dataForKey:key];
     if (data) {
-        @try { color = [NSUnarchiver unarchiveObjectWithData:data]; }
+        @try { color = [NSKeyedUnarchiver unarchiveObjectWithData:data]; }
         @catch (id e) {}
         if (color == nil) {
-            @try { color = [NSKeyedUnarchiver unarchiveObjectWithData:data]; }
+            @try { color = [NSUnarchiver unarchiveObjectWithData:data]; }
             @catch (id e) {}
         }
         if ([color isKindOfClass:[NSColor class]] == NO)
@@ -73,7 +73,7 @@
 }
 
 - (void)setColor:(NSColor *)color forKey:(NSString *)key {
-    NSData *data = color ? [NSArchiver archivedDataWithRootObject:color] : nil;
+    NSData *data = color ? [NSKeyedArchiver archivedDataWithRootObject:color] 
: nil;
     [self setObject:data forKey:key];
 }
 

Modified: trunk/NSValueTransformer_SKExtensions.m
===================================================================
--- trunk/NSValueTransformer_SKExtensions.m     2022-02-17 14:55:24 UTC (rev 
12794)
+++ trunk/NSValueTransformer_SKExtensions.m     2022-02-20 15:19:38 UTC (rev 
12795)
@@ -106,10 +106,10 @@
     if ([value isKindOfClass:[NSData class]] == NO)
         return nil;
     NSColor *color = nil;
-    @try { color = [NSUnarchiver unarchiveObjectWithData:value]; }
+    @try { color = [NSKeyedUnarchiver unarchiveObjectWithData:value]; }
     @catch (id e) {}
     if (color == nil) {
-        @try { color = [NSKeyedUnarchiver unarchiveObjectWithData:value]; }
+        @try { color = [NSUnarchiver unarchiveObjectWithData:value]; }
         @catch (id e) {}
     }
     if ([color isKindOfClass:[NSColor class]] == NO)
@@ -120,7 +120,7 @@
 - (id)reverseTransformedValue:(id)value {
     if ([value isKindOfClass:[NSColor class]] == NO)
         return nil;
-    return [NSArchiver archivedDataWithRootObject:value];
+    return [NSKeyedArchiver archivedDataWithRootObject:value];
 }
 
 @end

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



_______________________________________________
Skim-app-commit mailing list
Skim-app-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/skim-app-commit