Skip to content

Commit

Permalink
Bug fixes.
Browse files Browse the repository at this point in the history
  • Loading branch information
tatsy committed May 29, 2017
1 parent 5b54284 commit 1d91959
Show file tree
Hide file tree
Showing 6 changed files with 17 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ branches:

env:
global:
- GIT_TAG=v0.2.0
- GIT_TAG=v0.3.0

notifications:
email:
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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()

Expand Down
2 changes: 1 addition & 1 deletion docs/source/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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::
Expand Down
14 changes: 11 additions & 3 deletions docs/source/install.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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)).
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
4 changes: 2 additions & 2 deletions sources/python/pyutils.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@
#include <string>
#include <exception>
#include <boost/python.hpp>
#include <boost/numpy.hpp>
#include <boost/python/numpy.hpp>

namespace py = boost::python;
namespace npy = boost::numpy;
namespace npy = boost::python::numpy;

class PyLimeException : public std::exception {
public:
Expand Down

0 comments on commit 1d91959

Please sign in to comment.