sudacode/owocr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use CF methods for now

Browse Source
This commit is contained in:
AuroraWright
2024-02-11 19:47:06 -05:00
parent dd35140f76
commit d693e7563a
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
owocr/ocr.py
View File

@@ -23,7 +23,7 @@ try:
import Vision import Vision
import objc import objc
from AppKit import NSData, NSImage, NSBundle from AppKit import NSData, NSImage, NSBundle
from PyObjCTools.AppHelper import runConsoleEventLoop, stopEventLoop from CoreFoundation import CFRunLoopRun, CFRunLoopStop, CFRunLoopGetCurrent
except ImportError: except ImportError:
pass pass
@@ -349,7 +349,8 @@ class AppleLiveText:
req.setLocales_(['ja','en']) req.setLocales_(['ja','en'])
self.result = None self.result = None
self.analyzer.processRequest_progressHandler_completionHandler_(req, lambda progress: None, self._process) self.analyzer.processRequest_progressHandler_completionHandler_(req, lambda progress: None, self._process)
runConsoleEventLoop()
CFRunLoopRun()
if not self.result: if not self.result:
return (False, 'Unknown error!') return (False, 'Unknown error!')
@@ -362,7 +363,7 @@ class AppleLiveText:
for line in lines: for line in lines:
res += line.string() + '\n' res += line.string() + '\n'
self.result = res self.result = res
stopEventLoop() CFRunLoopStop(CFRunLoopGetCurrent())
def _preprocess(self, img): def _preprocess(self, img):
image_bytes = pil_image_to_bytes(img, 'tiff') image_bytes = pil_image_to_bytes(img, 'tiff')

2
owocr/run.py
View File

@@ -404,7 +404,7 @@ def run(read_from=None,
for config_engine in config.get_general('engines').split(','): for config_engine in config.get_general('engines').split(','):
config_engines.append(config_engine.strip().lower()) config_engines.append(config_engine.strip().lower())
for _,engine_class in sorted(inspect.getmembers(sys.modules[__name__], lambda x: hasattr(x, '__module__') and __package__ + '.ocr' in x.__module__ and inspect.isclass(x))): for _,engine_class in sorted(inspect.getmembers(sys.modules[__name__], lambda x: hasattr(x, '__module__') and x.__module__ and __package__ + '.ocr' in x.__module__ and inspect.isclass(x))):
if len(config_engines) == 0 or engine_class.name in config_engines: if len(config_engines) == 0 or engine_class.name in config_engines:
if config.get_engine(engine_class.name) == None: if config.get_engine(engine_class.name) == None:
engine_instance = engine_class() engine_instance = engine_class()