diff --git a/.travis.yml b/.travis.yml index dabc196..6995efb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -67,7 +67,7 @@ branches: env: global: - - GIT_TAG=v0.2.0 + - GIT_TAG=v0.3.0 notifications: email: diff --git a/CMakeLists.txt b/CMakeLists.txt index fb75063..0f245cc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -14,7 +14,7 @@ option(LIME_BUILD_PYTHON_MODULE "Build python modules." OFF) # ------------------------------------------------------------------------------ find_package( OpenCV 3.0 REQUIRED ) if (${LIME_BUILD_PYTHON_MODULE}) - find_package( PythonLibs 3 REQUIRED ) + find_package( PythonLibs REQUIRED ) find_package( Boost REQUIRED python numpy ) endif() diff --git a/docs/source/index.rst b/docs/source/index.rst index bf8b6ff..47e16b4 100644 --- a/docs/source/index.rst +++ b/docs/source/index.rst @@ -4,7 +4,7 @@ Welcome to Lime's documentation! ================================ -Lime (Library for IMage Editing) is an image editing library extending OpenCV +Lime (Library for IMage Editing) is an image editing library extending OpenCV 3.x which is developed for C/C++ and Python. .. toctree:: diff --git a/docs/source/install.rst b/docs/source/install.rst index 12c4aa7..16b6e82 100644 --- a/docs/source/install.rst +++ b/docs/source/install.rst @@ -27,9 +27,14 @@ your program source codes. Python -------- -For Python users, you can build the library with CMake. After building it, -you can install it normally with ``setup.py``. Following is the simple -installation steps. +For Python users, you can build the library with CMake. While `lime` depends +on `OpenCV` and `boost python/numpy`, you need to install these libraries beforehands. +Please make sure, the versions of these libraries meet the following requirements. + +* OpenCV 3.0 or higher +* Boost 1.63 or higher and build boost-python and boost-numpy + +After install these libraries, you can build and install the python library with following shell script. .. code-block:: shell @@ -44,3 +49,6 @@ installation steps. While building the source codes with CMake, you may ought to specify your python include and library directories. + +If the installation is failed, you should check whether `lime` binary file appears in 'build/lib' directory +(the name of the binary would be `lime.pyd` (Windows), 'liblime.dylib' (MacOS) or 'lime.so' (Linux)). diff --git a/setup.py b/setup.py index a8f900a..10ccdcf 100644 --- a/setup.py +++ b/setup.py @@ -59,7 +59,7 @@ def run(self): setup( cmdclass={ 'install' : install }, name='lime', - version='0.2.0', + version='0.3.0', author='tatsy', author_email='tatsy.mail@gmail.com', url='https://github.com/tatsy/lime.git', diff --git a/sources/python/pyutils.h b/sources/python/pyutils.h index 608df2f..eeda529 100644 --- a/sources/python/pyutils.h +++ b/sources/python/pyutils.h @@ -8,10 +8,10 @@ #include #include #include -#include +#include namespace py = boost::python; -namespace npy = boost::numpy; +namespace npy = boost::python::numpy; class PyLimeException : public std::exception { public: