[Skim-app-commit] SF.net SVN: skim-app:[12803] trunk/SkimNotes/PDFAnnotation_SKNExtensions.m

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

Revision: 12803
          http://sourceforge.net/p/skim-app/code/12803
Author:   hofman
Date:     2022-02-25 23:00:28 +0000 (Fri, 25 Feb 2022)
Log Message:
-----------
Also interpret two numbers as generic gamma 2.2 white color in fallback

Modified Paths:
--------------
    trunk/SkimNotes/PDFAnnotation_SKNExtensions.m

Modified: trunk/SkimNotes/PDFAnnotation_SKNExtensions.m
===================================================================
--- trunk/SkimNotes/PDFAnnotation_SKNExtensions.m       2022-02-23 15:48:25 UTC 
(rev 12802)
+++ trunk/SkimNotes/PDFAnnotation_SKNExtensions.m       2022-02-25 23:00:28 UTC 
(rev 12803)
@@ -94,17 +94,26 @@
 NSString *SKNPDFAnnotationFieldNameKey = @"fieldName";
 
 static inline NSColor *SKNColorFromArray(NSArray *array) {
-    CGFloat c[4] = {0.0, 0.0, 0.0, 1.0};
     if ([array count] > 2) {
+        CGFloat c[4] = {0.0, 0.0, 0.0, 1.0};
         NSUInteger i;
         for (i = 0; i < MAX([array count], 4); i++)
             c[i] = [[array objectAtIndex:i] doubleValue];
+        return [NSColor colorWithColorSpace:[NSColorSpace sRGBColorSpace] 
components:c count:4];
     } else if ([array count] > 0) {
-        c[0] = c[1] = c[2] = [[array objectAtIndex:0] doubleValue];
+        CGFloat c[2] = {0.0, 1.0};
+        c[0] = [[array objectAtIndex:0] doubleValue];
         if ([array count] == 2)
-            c[3] = [[array objectAtIndex:1] doubleValue];
+            c[1] = [[array objectAtIndex:1] doubleValue];
+#if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_6
+        if ([NSColorSpace 
respondsToSelector:@selector(genericGamma22GrayColorSpace)] == NO)
+            return [NSColor colorWithColorSpace:[NSColorSpace 
genericGrayColorSpace] components:c count:2];
+        else
+#endif
+        return [NSColor colorWithColorSpace:[NSColorSpace 
genericGamma22GrayColorSpace] components:c count:2];
+    } else {
+        return [NSColor clearColor];
     }
-    return [NSColor colorWithColorSpace:[NSColorSpace sRGBColorSpace] 
components:c count:4];
 }
 
 #if !defined(MAC_OS_X_VERSION_10_12) || MAC_OS_X_VERSION_MAX_ALLOWED < 
MAC_OS_X_VERSION_10_12

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