From cade235fe54b7e10a08bace5def8e4016442c703 Mon Sep 17 00:00:00 2001 From: kervala Date: Sat, 14 Oct 2017 12:04:01 +0200 Subject: [PATCH 1/6] Fixed: Disable servers compilation with Travis because it's taking too much time --HG-- branch : develop --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index c59df07eb..9c7337d55 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,7 +9,7 @@ os: matrix: fast_finish: true env: - - CMAKE_CONFIGURE_OPTIONS="-DWITH_NEL_TESTS=OFF -DWITH_LUA51=ON" + - CMAKE_CONFIGURE_OPTIONS="-DWITH_NEL_TESTS=OFF -DWITH_LUA51=ON -DWITH_RYZOM_SERVER=OFF" - CMAKE_CONFIGURE_OPTIONS="-DCPPTEST_LIBRARY_DEBUG:STRING=/usr/lib/libcpptest.so" CMAKE_BUILD_OPTIONS="--target nel_unit_test -- -j 2" RUN="build/bin/nel_unit_test" From 68ccee68319538d0fa9e208c33428accb2ebfb89 Mon Sep 17 00:00:00 2001 From: kervala Date: Sat, 14 Oct 2017 16:55:13 +0200 Subject: [PATCH 2/6] Changed: Also disable Ryzom tools for Travis --HG-- branch : develop --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 9c7337d55..691112350 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,7 +9,7 @@ os: matrix: fast_finish: true env: - - CMAKE_CONFIGURE_OPTIONS="-DWITH_NEL_TESTS=OFF -DWITH_LUA51=ON -DWITH_RYZOM_SERVER=OFF" + - CMAKE_CONFIGURE_OPTIONS="-DWITH_NEL_TESTS=OFF -DWITH_LUA51=ON -DWITH_RYZOM_SERVER=OFF -DWOTH_RYZOM_TOOLS=OFF" - CMAKE_CONFIGURE_OPTIONS="-DCPPTEST_LIBRARY_DEBUG:STRING=/usr/lib/libcpptest.so" CMAKE_BUILD_OPTIONS="--target nel_unit_test -- -j 2" RUN="build/bin/nel_unit_test" From 4995760334870428d6f815cbe724262897ead2f3 Mon Sep 17 00:00:00 2001 From: kervala Date: Sat, 14 Oct 2017 18:31:19 +0200 Subject: [PATCH 3/6] Fixed: Don't compile ryzom_servershare and ryzom_aishare if not using Ryzom server or tools --HG-- branch : develop --- code/ryzom/server/src/CMakeLists.txt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/code/ryzom/server/src/CMakeLists.txt b/code/ryzom/server/src/CMakeLists.txt index 73e0536d1..fc91decc4 100644 --- a/code/ryzom/server/src/CMakeLists.txt +++ b/code/ryzom/server/src/CMakeLists.txt @@ -1,8 +1,10 @@ # Supporting modules and libraries. # Need servershare for build packed collision tool # Need aishare for build wmap tool -ADD_SUBDIRECTORY(server_share) -ADD_SUBDIRECTORY(ai_share) +IF(WITH_RYZOM_TOOLS OR WITH_RYZOM_SERVER) + ADD_SUBDIRECTORY(server_share) + ADD_SUBDIRECTORY(ai_share) +ENDIF() IF(WITH_RYZOM_SERVER) From 8c227708767a6cba85a0cbe67917013e29d6682b Mon Sep 17 00:00:00 2001 From: kervala Date: Sun, 15 Oct 2017 15:01:09 +0200 Subject: [PATCH 4/6] Fixed: Typo --HG-- branch : develop --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 691112350..18de2b579 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,7 +9,7 @@ os: matrix: fast_finish: true env: - - CMAKE_CONFIGURE_OPTIONS="-DWITH_NEL_TESTS=OFF -DWITH_LUA51=ON -DWITH_RYZOM_SERVER=OFF -DWOTH_RYZOM_TOOLS=OFF" + - CMAKE_CONFIGURE_OPTIONS="-DWITH_NEL_TESTS=OFF -DWITH_LUA51=ON -DWITH_RYZOM_SERVER=OFF -DWITH_RYZOM_TOOLS=OFF" - CMAKE_CONFIGURE_OPTIONS="-DCPPTEST_LIBRARY_DEBUG:STRING=/usr/lib/libcpptest.so" CMAKE_BUILD_OPTIONS="--target nel_unit_test -- -j 2" RUN="build/bin/nel_unit_test" From d721c661ea9aacf78eb84d8059bf7b8a68c5236b Mon Sep 17 00:00:00 2001 From: kervala Date: Sun, 15 Oct 2017 16:49:27 +0200 Subject: [PATCH 5/6] Changed: Disable NeL tools too (compilation is still taking more than 50 minutes... and is killed) --HG-- branch : develop --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 18de2b579..6bfad3c3b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,7 +9,7 @@ os: matrix: fast_finish: true env: - - CMAKE_CONFIGURE_OPTIONS="-DWITH_NEL_TESTS=OFF -DWITH_LUA51=ON -DWITH_RYZOM_SERVER=OFF -DWITH_RYZOM_TOOLS=OFF" + - CMAKE_CONFIGURE_OPTIONS="-DWITH_NEL_TESTS=OFF -DWITH_LUA51=ON -DWITH_RYZOM_SERVER=OFF -DWITH_RYZOM_TOOLS=OFF -DWITH_NEL_TOOLS=OFF" - CMAKE_CONFIGURE_OPTIONS="-DCPPTEST_LIBRARY_DEBUG:STRING=/usr/lib/libcpptest.so" CMAKE_BUILD_OPTIONS="--target nel_unit_test -- -j 2" RUN="build/bin/nel_unit_test" From 81adb6c78766367368f5e001f4ceade7b85a5dc6 Mon Sep 17 00:00:00 2001 From: Nimetu Date: Mon, 16 Oct 2017 19:38:35 +0300 Subject: [PATCH 6/6] Fixed: Reading gif, off-by-one --HG-- branch : develop --- code/nel/src/misc/bitmap_gif.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/code/nel/src/misc/bitmap_gif.cpp b/code/nel/src/misc/bitmap_gif.cpp index 5b964998a..653942d08 100644 --- a/code/nel/src/misc/bitmap_gif.cpp +++ b/code/nel/src/misc/bitmap_gif.cpp @@ -215,9 +215,6 @@ uint8 CBitmap::readGIF( NLMISC::IStream &f ) for (uint32 x = 0; x < width; x++) { - srcOffset++; - dstOffset+= dstChannels; - uint32 index = curFrame->RasterBits[srcOffset]; if ((sint32)index != transparency) @@ -250,6 +247,9 @@ uint8 CBitmap::readGIF( NLMISC::IStream &f ) _Data[0][dstOffset+1] = g; _Data[0][dstOffset+2] = b; _Data[0][dstOffset+3] = a; + + srcOffset++; + dstOffset+= dstChannels; } // x loop } // y loop } // pass loop @@ -262,9 +262,6 @@ uint8 CBitmap::readGIF( NLMISC::IStream &f ) uint32 dstOffset = (y + offset_y)*gif->SWidth*dstChannels + offset_x*dstChannels; for (uint32 x = 0; x < width; x++) { - srcOffset++; - dstOffset+= dstChannels; - uint32 index = curFrame->RasterBits[srcOffset]; if ((sint32)index != transparency) @@ -297,6 +294,9 @@ uint8 CBitmap::readGIF( NLMISC::IStream &f ) _Data[0][dstOffset+1] = g; _Data[0][dstOffset+2] = b; _Data[0][dstOffset+3] = a; + + srcOffset++; + dstOffset+= dstChannels; } // x loop } // y loop }