From 37a40040b34458f95dae6555643ab116e3395510 Mon Sep 17 00:00:00 2001 From: hsoft Date: Sat, 24 Oct 2009 13:54:57 +0000 Subject: [PATCH] [#73 state:port] Fixed a bug causing some matches to be ignored in the new pe match algo. --HG-- extra : convert_revision : svn%3Ac306627e-7827-47d3-bdf0-9a457c9553a1/trunk%40212 --- pe/py/app_cocoa.py | 2 +- pe/py/matchbase.py | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/pe/py/app_cocoa.py b/pe/py/app_cocoa.py index 74e89701..8b9bd23b 100644 --- a/pe/py/app_cocoa.py +++ b/pe/py/app_cocoa.py @@ -36,7 +36,7 @@ class Photo(fs.File): INITIAL_INFO.update({ 'dimensions': (0,0), }) - HANDLED_EXTS = set(['png', 'jpg', 'jpeg', 'gif', 'psd', 'bmp', 'tiff', 'nef', 'cr2']) + HANDLED_EXTS = set(['png', 'jpg', 'jpeg', 'gif', 'psd', 'bmp', 'tiff', 'tif', 'nef', 'cr2']) @classmethod def can_handle(cls, path): diff --git a/pe/py/matchbase.py b/pe/py/matchbase.py index 3490620b..8cfae038 100644 --- a/pe/py/matchbase.py +++ b/pe/py/matchbase.py @@ -111,6 +111,8 @@ def getmatches(pictures, cached_blocks, threshold=75, match_scaled=False, j=job. if len(async_results) > RESULTS_QUEUE_LIMIT: result = async_results.pop(0) matches.extend(result.get()) + for result in async_results: # process the rest of the results + matches.extend(result.get()) result = [] for ref_id, other_id, percentage in j.iter_with_progress(matches, 'Verified %d/%d matches', every=10):