Merge with develop

--HG--
branch : compatibility-develop

.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 -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"

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
 	}

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)