diff options
| author | Timothy Knight <tknight@google.com> | 2014-09-04 22:55:03 -0700 |
|---|---|---|
| committer | Timothy Knight <tknight@google.com> | 2014-09-04 22:55:03 -0700 |
| commit | 21ffd610506e482ea4138088048761b8f6e71440 (patch) | |
| tree | 83cb5597e53817834f43c38d856073ce2a5e9722 /apps | |
| parent | 1820b2153fcd3069c89d97d990d3caeeddcdeda2 (diff) | |
| download | pdk-21ffd610506e482ea4138088048761b8f6e71440.tar.gz | |
CameraITS: Removed opencv module from instructions
Change-Id: I1bb648673deca58f99f560e7e09998d461455f09
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/CameraITS/README | 13 | ||||
| -rw-r--r-- | apps/CameraITS/build/envsetup.sh | 7 |
2 files changed, 5 insertions, 15 deletions
diff --git a/apps/CameraITS/README b/apps/CameraITS/README index 471c933..fc385f0 100644 --- a/apps/CameraITS/README +++ b/apps/CameraITS/README @@ -77,19 +77,6 @@ Note that the Anaconda python executable's directory must be at the front of your PATH environment variable, assuming that you are using this Python distribution. The Anaconda installer may set this up for you automatically. -Some tests require OpenCV to be installed. - -(For Ubuntu users) - - sudo apt-get install python2.7-opencv - -(For Anaconda users) - - conda install opencv - -To verify that OpenCV is installed properly, the "cv2" package should be -available to be imported from inside the Python interpreter. - Once your Python installation is ready, set up the test environment. 2.2.1. Linux + Mac OS X diff --git a/apps/CameraITS/build/envsetup.sh b/apps/CameraITS/build/envsetup.sh index a258ddb..7e2a86b 100644 --- a/apps/CameraITS/build/envsetup.sh +++ b/apps/CameraITS/build/envsetup.sh @@ -29,8 +29,11 @@ command -v python >/dev/null 2>&1 || \ python -V 2>&1 | grep -q "Python 2.7" || \ echo ">> Require python 2.7" >&2 -python -c 'import numpy, PIL, Image, matplotlib, pylab, cv2' >/dev/null 2>&1 || \ - echo ">> Require numpy+scipy stack" >&2 +for M in numpy PIL Image matplotlib pylab +do + python -c "import $M" >/dev/null 2>&1 || \ + echo ">> Require Python $M module" >&2 +done export PYTHONPATH="$PWD/pymodules:$PYTHONPATH" |