reverted travis yaml

.travis/install.sh

@@ -8,11 +8,11 @@ if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
 elif [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
 
 	if [ "$ARCH" == "x86_64" ]; then
-		sudo apt-get -y install qt59base qt59multimedia libavformat-dev libavcodec-dev libavfilter-dev libavutil-dev libswscale-dev libswresample-dev frei0r-plugins-dev frei0r-plugins fuse libgtk2.0-dev
+		sudo apt-get -y install qt59base qt59multimedia libavformat-dev libavcodec-dev libavfilter-dev libavutil-dev libswscale-dev libswresample-dev frei0r-plugins-dev frei0r-plugins fuse
 	fi
 
 	if [ "$ARCH" == "i386" ]; then
-		sudo apt-get -y install gcc-multilib g++-multilib qt59base:i386 qt59multimedia:i386 libavformat-dev:i386 libavcodec-dev:i386 libavfilter-dev:i386 libavutil-dev:i386 libswscale-dev:i386 libswresample-dev:i386 frei0r-plugins-dev:i386 frei0r-plugins:i386 pkg-config:i386 libgl1-mesa-dev:i386 fuse:i386 libgtk2.0-dev:i386
+		sudo apt-get -y install gcc-multilib g++-multilib qt59base:i386 qt59multimedia:i386 libavformat-dev:i386 libavcodec-dev:i386 libavfilter-dev:i386 libavutil-dev:i386 libswscale-dev:i386 libswresample-dev:i386 frei0r-plugins-dev:i386 frei0r-plugins:i386 pkg-config:i386 libgl1-mesa-dev:i386 fuse:i386
 	fi
 	source /opt/qt*/bin/qt*-env.sh
 

.travis/script.sh

@@ -31,14 +31,6 @@ if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
 
 elif [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
 
-	# get, compile, and install GTK style plugin
-	git clone http://code.qt.io/qt/qtstyleplugins.git
-	cd qtstyleplugins
-	qmake
-	make -j$(nproc)
-	make install
-	cd -
-
 	# generate translation files
 	lrelease olive.pro
 
@@ -66,7 +58,7 @@ elif [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
 	export VERSION=$(git rev-parse --short HEAD)
 
 	# use linuxdeployqt to set up dependencies
-	./linuxdeployqt-continuous-x86_64.AppImage appdir/usr/share/applications/*.desktop -appimage -extra-plugins=platformthemes/libqgtk2.so,styles/libqgtk2style.so
+	./linuxdeployqt-continuous-x86_64.AppImage appdir/usr/share/applications/*.desktop -appimage
 
 	# 64-bit linuxdeployqt can only generate a 64-bit AppImage
 	# to generate a 32-bit one, we need to download and run 32-bit AppImageTool

ui/renderthread.cpp

@@ -29,12 +29,6 @@
 #include "playback/playback.h"
 #include "project/sequence.h"
 
-// copied from source code to OCIODisplay
-#define LUT3D_EDGE_SIZE 32
-
-// copied from source code to OCIODisplay, expanded from 3*LUT3D_EDGE_SIZE*LUT3D_EDGE_SIZE*LUT3D_EDGE_SIZE
-#define NUM_3D_ENTRIES 98304
-
 RenderThread::RenderThread() :
 	front_buffer(0),
 	front_texture(0),