|
|
@@ -418,17 +418,16 @@ extension KMOCRManager {
|
|
|
|
|
|
func dealImage(image: NSImage, isCorrection: Bool, isEnhancement: Bool) -> NSImage? {
|
|
|
// return image
|
|
|
+ var resultImage: NSImage = image
|
|
|
let tempImage = NSImage(data: image.jpgData()!)! //NSImage(named: "doc_scan_3")!
|
|
|
let cimEngine = CIMEngine()
|
|
|
- var engineImage = tempImage
|
|
|
if isEnhancement {
|
|
|
- engineImage = cimEngine.process(withInputImage: tempImage)
|
|
|
+ resultImage = cimEngine.process(withInputImage: tempImage)
|
|
|
}
|
|
|
|
|
|
- var resultImage: NSImage = engineImage
|
|
|
let semaphore = DispatchSemaphore(value: 0)
|
|
|
if isCorrection {
|
|
|
- cimEngine.correction(withInpuImage: engineImage) { model, error in
|
|
|
+ cimEngine.correction(withInpuImage: resultImage) { model, error in
|
|
|
resultImage = model.outputImage
|
|
|
semaphore.signal() // 通知主线程继续执行
|
|
|
}
|
