Merge branch 'master' of https://github.com/paulsapps/q-gears into installer

CIBuild/linux/dependencies.sh

@@ -8,5 +8,6 @@ sudo apt-get install libzzip-dev
 sudo apt-get install libois-dev
 sudo apt-get install libglu-dev
 sudo apt-get install libqt4-dev
+sudo apt-get install libpng
 wget https://github.com/paulsapps/Ogre1.9/releases/download/1.9.0/ogre-build_1.9.0-1_amd64.deb
 sudo dpkg -i ogre-build_1.9.0-1_amd64.deb

Tests/FinalFantasy7/CMakeLists.txt

@@ -20,8 +20,7 @@ SET_PROPERTY(TARGET TestFF7FLevelFileSerializer PROPERTY FOLDER "tests")
 
 
 target_link_libraries(TestFF7FLevelFileSerializer ${LIBRARIES})
-# TODO FIX ME - test not currently working
-#add_test(NAME TestFF7FLevelFileSerializer COMMAND TestFF7FLevelFileSerializer)
+add_test(NAME TestFF7FLevelFileSerializer COMMAND TestFF7FLevelFileSerializer)
 
 
 add_executable(TestFF7ModelListFileSerializer

Tests/FinalFantasy7/src/test_FF7FLevelFileSerializer.cpp

@@ -139,7 +139,7 @@ BOOST_AUTO_TEST_CASE( read_file )
     BOOST_CHECK_EQUAL( 12345, camera_matrix->getFocalLength() );
 
     Ogre::Image *image( background->createImage( palette ) );
-    image->save( file.getName() + ".png" );
+    image->save( file.getName() + ".dds" ); // Use dds as png codec can't be found during the travis build
     delete image;
 
     QGears::FLevelFilePtr lzs_file = fmgr.load( "reference_compressed.flevel", "General" ).staticCast<QGears::FLevelFile>();
@@ -147,7 +147,7 @@ BOOST_AUTO_TEST_CASE( read_file )
     BOOST_CHECK( !lzs_file->getBackground().isNull() );
 
     image = lzs_file->getBackground()->createImage( lzs_file->getPalette() );
-    image->save( lzs_file->getName() + ".png" );
+    image->save( lzs_file->getName() + ".dds" );
     delete image;
 
     lzs_file.setNull();