Merge branch 'release/0.2'

lxdo517 · May 18, 2016 · 067fd0b · 067fd0b
2 parents b94f704 + 1d9d661
commit 067fd0b
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -35,3 +35,7 @@ regions
 
 See also an example/example.py which generates :
 ![alt tag](https://github.com/AlpacaDB/selectivesearch/raw/develop/example/result.png)
+
+## Blog
+- EN: http://blog.alpaca.ai/open-source-pure-python-selective-search-and-advanced-object-recognition-with-labellio/
+- JP: http://blog-jp.alpaca.ai/entry/2015/08/05/235408
diff --git a/selectivesearch/selectivesearch.py b/selectivesearch/selectivesearch.py
@@ -198,8 +198,8 @@ def intersect(a, b):
                 and a["min_y"] < b["max_y"] < a["max_y"]) or (
             a["min_x"] < b["min_x"] < a["max_x"]
                 and a["min_y"] < b["max_y"] < a["max_y"]) or (
-            a["min_x"] < b["min_x"] < a["max_x"]
-                and a["min_y"] < b["max_y"] < a["max_y"]):
+            a["min_x"] < b["max_x"] < a["max_x"]
+                and a["min_y"] < b["min_y"] < a["max_y"]):
             return True
         return False
 

diff --git a/setup.py b/setup.py
@@ -2,7 +2,7 @@
 
 setup(
     name="selectivesearch",
-    version="0.1",
+    version="0.2",
     url="https://github.com/AlpacaDB/selectivesearch",
     description="Selective Search implementation for Python",
     author="AlpacaDB, Inc.",