Revision: 13494
http://sourceforge.net/p/skim-app/code/13494
Author: hofman
Date: 2023-06-20 14:14:40 +0000 (Tue, 20 Jun 2023)
Log Message:
-----------
define and use NSAppKitVersionNumber13_0 to check for PostScript conversion
support
Modified Paths:
--------------
trunk/QuickLook-Skim/GeneratePreviewForURL.m
trunk/QuickLook-Skim/GenerateThumbnailForURL.m
trunk/SKCompatibility.h
trunk/SKConversionProgressController.m
Modified: trunk/QuickLook-Skim/GeneratePreviewForURL.m
===================================================================
--- trunk/QuickLook-Skim/GeneratePreviewForURL.m 2023-06-19 18:53:22 UTC
(rev 13493)
+++ trunk/QuickLook-Skim/GeneratePreviewForURL.m 2023-06-20 14:14:40 UTC
(rev 13494)
@@ -85,7 +85,7 @@
} else if (UTTypeEqual(CFSTR("com.adobe.postscript"), contentTypeUTI)) {
- if (@available(macOS 14.0, *)) {} else {
+ if (floor(NSAppKitVersionNumber) <= 2299.0) {
bool converted = false;
CGPSConverterCallbacks converterCallbacks = { 0, NULL, NULL, NULL,
NULL, NULL, NULL, NULL };
CGPSConverterRef converter = CGPSConverterCreate(NULL,
&converterCallbacks, NULL);
Modified: trunk/QuickLook-Skim/GenerateThumbnailForURL.m
===================================================================
--- trunk/QuickLook-Skim/GenerateThumbnailForURL.m 2023-06-19 18:53:22 UTC
(rev 13493)
+++ trunk/QuickLook-Skim/GenerateThumbnailForURL.m 2023-06-20 14:14:40 UTC
(rev 13494)
@@ -163,7 +163,7 @@
} else if (UTTypeEqual(CFSTR("com.adobe.postscript"), contentTypeUTI)) {
- if (@available(macOS 14.0, *)) {} else {
+ if (floor(NSAppKitVersionNumber) <= 2299.0) {
bool converted = false;
CGPSConverterCallbacks converterCallbacks = { 0, NULL, NULL, NULL,
NULL, NULL, NULL, NULL };
CGPSConverterRef converter = CGPSConverterCreate(NULL,
&converterCallbacks, NULL);
Modified: trunk/SKCompatibility.h
===================================================================
--- trunk/SKCompatibility.h 2023-06-19 18:53:22 UTC (rev 13493)
+++ trunk/SKCompatibility.h 2023-06-20 14:14:40 UTC (rev 13494)
@@ -77,6 +77,15 @@
#ifndef MAC_OS_VERSION_11_1
#define MAC_OS_VERSION_11_1 110100
#endif
+#ifndef MAC_OS_VERSION_12_0
+ #define MAC_OS_VERSION_12_0 120000
+#endif
+#ifndef MAC_OS_VERSION_13_0
+ #define MAC_OS_VERSION_13_0 130000
+#endif
+#ifndef MAC_OS_VERSION_14_0
+ #define MAC_OS_VERSION_14_0 140000
+#endif
#if SDK_BEFORE(10_13)
@@ -101,6 +110,15 @@
#ifndef NSAppKitVersionNumber10_15
#define NSAppKitVersionNumber10_15 1894
#endif
+#ifndef NSAppKitVersionNumber11_0
+ #define NSAppKitVersionNumber11_0 2022
+#endif
+#ifndef NSAppKitVersionNumber12_0
+ #define NSAppKitVersionNumber12_0 2113
+#endif
+#ifndef NSAppKitVersionNumber13_0
+ #define NSAppKitVersionNumber13_0 2299
+#endif
#elif SDK_BEFORE(10_14)
@@ -107,16 +125,40 @@
static const NSAppKitVersion NSAppKitVersionNumber10_13 = 1561;
static const NSAppKitVersion NSAppKitVersionNumber10_14 = 1671;
static const NSAppKitVersion NSAppKitVersionNumber10_15 = 1894;
+static const NSAppKitVersion NSAppKitVersionNumber11_0 = 2022;
+static const NSAppKitVersion NSAppKitVersionNumber12_0 = 2113;
+static const NSAppKitVersion NSAppKitVersionNumber13_0 = 2299;
#elif SDK_BEFORE(10_15)
static const NSAppKitVersion NSAppKitVersionNumber10_14 = 1671;
static const NSAppKitVersion NSAppKitVersionNumber10_15 = 1894;
+static const NSAppKitVersion NSAppKitVersionNumber11_0 = 2022;
+static const NSAppKitVersion NSAppKitVersionNumber12_0 = 2113;
+static const NSAppKitVersion NSAppKitVersionNumber13_0 = 2299;
#elif SDK_BEFORE(11_0)
static const NSAppKitVersion NSAppKitVersionNumber10_15 = 1894;
+static const NSAppKitVersion NSAppKitVersionNumber11_0 = 2022;
+static const NSAppKitVersion NSAppKitVersionNumber12_0 = 2113;
+static const NSAppKitVersion NSAppKitVersionNumber13_0 = 2299;
+#elif SDK_BEFORE(12_0)
+
+static const NSAppKitVersion NSAppKitVersionNumber11_0 = 2022;
+static const NSAppKitVersion NSAppKitVersionNumber12_0 = 2113;
+static const NSAppKitVersion NSAppKitVersionNumber13_0 = 2299;
+
+#elif SDK_BEFORE(13_0)
+
+static const NSAppKitVersion NSAppKitVersionNumber12_0 = 2113;
+static const NSAppKitVersion NSAppKitVersionNumber13_0 = 2299;
+
+#elif SDK_BEFORE(14_0)
+
+static const NSAppKitVersion NSAppKitVersionNumber13_0 = 2299;
+
#endif
#ifndef NS_ENUM
Modified: trunk/SKConversionProgressController.m
===================================================================
--- trunk/SKConversionProgressController.m 2023-06-19 18:53:22 UTC (rev
13493)
+++ trunk/SKConversionProgressController.m 2023-06-20 14:14:40 UTC (rev
13494)
@@ -253,16 +253,13 @@
NSWorkspace *ws = [NSWorkspace sharedWorkspace];
CGDataProviderRef provider = NULL;
- BOOL isCGPSSupported = YES;
- if (@available(macOS 14.0, *)) { isCGPSSupported = NO; }
+ if (!RUNNING_AFTER(13_0) || [ws type:fileType
conformsToType:SKPostScriptDocumentType] == NO) {
- if (isCGPSSupported == NO || [ws type:fileType
conformsToType:SKPostScriptDocumentType] == NO) {
-
NSString *toolPath = nil;
if ([ws type:fileType conformsToType:SKDVIDocumentType]) {
static NSString *dviToolPath = nil;
if (dviToolPath == nil)
- dviToolPath =
createToolPathForCommand(SKDviConversionCommandKey, isCGPSSupported ?
@[@"dvipdfmx", @"dvipdfm", @"dvipdf", @"dvips"] : @[@"dvipdfmx", @"dvipdfm",
@"dvipdf"]);
+ dviToolPath =
createToolPathForCommand(SKDviConversionCommandKey, RUNNING_AFTER(13_0) ?
@[@"dvipdfmx", @"dvipdfm", @"dvipdf"] : @[@"dvipdfmx", @"dvipdfm", @"dvipdf",
@"dvips"]);
toolPath = dviToolPath;
} else if ([ws type:fileType conformsToType:SKXDVDocumentType]) {
static NSString *xdvToolPath = nil;
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
