Merge cdd6a12150 into 30979d4dd4

.travis.yml

@@ -26,9 +26,6 @@ install:
   # webp
   - pushd depends && ./install_webp.sh && popd
 
-  # openjpeg
-  - pushd depends && ./install_openjpeg.sh && popd
-
 script:
   - coverage erase
   - python setup.py clean
@@ -41,7 +38,7 @@ after_success:
    # gather the coverage data
   - lcov --capture --directory . -b . --output-file coverage.info
    # filter to remove system headers
-  - lcov --remove coverage.info '/usr/*' -o coverage.filtered.info     
+  - lcov --remove coverage.info '/usr/*' -o coverage.filtered.info
    # convert to json
   - coveralls-lcov -v -n coverage.filtered.info > coverage.c.json
 

depends/install_openjpeg.sh

@@ -1,19 +0,0 @@
-#!/bin/bash
-# install openjpeg
-
-
-if [ ! -f openjpeg-2.1.0.tar.gz ]; then
-    wget 'http://iweb.dl.sourceforge.net/project/openjpeg.mirror/2.1.0/openjpeg-2.1.0.tar.gz'
-
-fi
-
-rm -r openjpeg-2.1.0
-tar -xvzf openjpeg-2.1.0.tar.gz
-
-
-pushd openjpeg-2.1.0 
-
-cmake -DCMAKE_INSTALL_PREFIX=/usr . && make && sudo make install
-
-popd
-