【综合】兼容DMG版本

PDF Office/PDF Master/Class/PDFTools/Convert/ExtractImage/Controller/KMExtractImageWindowController.swift

@@ -34,7 +34,7 @@ class KMExtractImageWindowController: NSWindowController,PDFConvertObjectDelegat
     var selectPagesIndex: Int = 0
 //    var pdfConverter: PDFConvertObject?
     lazy var pdfConverter: PDFConvertObject? = {
-        let conerter = PDF_Master.PDFConvertObject()
+        let conerter = PDFConvertObject()
         return conerter
     }()
     @IBOutlet var currentPageTextField: NSTextField!
@@ -303,7 +303,7 @@ class KMExtractImageWindowController: NSWindowController,PDFConvertObjectDelegat
     @objc func pageChangeNotification(_ notification: Notification) {
         self.currentPageTextField.stringValue = self.preViewPDFView.currentPage().label ?? ""
     }
-    func PDFConvertObject(_ converter: PDFConvertObject, didEndConversion error: Error?) {
+    func PDFConvertObject2(_ converter: PDFConvertObject, didEndConversion error: Error?) {
         self.hideWaitting() 
         self.window?.sheetParent?.endSheet(self.window!)
     }

PDF Office/PDF Master/Class/PDFTools/Convert/ExtractImage/Model/PDFConvertObject.swift

@@ -14,7 +14,7 @@ protocol PDFConvertObjectDelegate: AnyObject {
     @objc optional func PDFConvertObjectDidPdfPage(_ converter: PDFConvertObject, didPDFPageIndexA: Int, didPageCountA: Int)
 }
 
-class PDFConvertObject: NSObject{
+class PDFConvertObject: NSObject {
     var delegate: PDFConvertObjectDelegate?
     var document: CPDFDocument?
     lazy var suffix: Int = {

PDF Office/PDF Master/PDF_Master DMG-Bridging-Header.h

@@ -18,7 +18,7 @@
 #import "CTTabController.h"
 #import "CTBrowserWindow.h"
 #import "CPDFListView+Public.h"
-#import "KMGeneralAnnotationViewController.h"
+//#import "KMGeneralAnnotationViewController.h"
 #import "KMAnnotationPropertiesViewController.h"
 
 #import "CPDFListView+Tool.h"