diff --git a/code/nel/src/misc/CMakeLists.txt b/code/nel/src/misc/CMakeLists.txt index bfa8af849..ab91a9cc0 100644 --- a/code/nel/src/misc/CMakeLists.txt +++ b/code/nel/src/misc/CMakeLists.txt @@ -48,17 +48,7 @@ NL_ADD_LIB_SUFFIX(nelmisc) ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) -IF(WITH_STATIC) -# acemtp: it's because my gcc is too old and cannot optimize this file -# on old gcc used to compile static ryzom, if you compile rgba with full optim, there's a visual bug (blue people) -SET_SOURCE_FILES_PROPERTIES(rgba.cpp PROPERTIES COMPILE_FLAGS "-O0") -ENDIF(WITH_STATIC) - -IF(WITH_PCH AND NOT WITH_STATIC) -# acemtp: it's because my gcc is too old and cannot optimize this file -# removed the pch or we cannot define -O0 for the rgba specificaly ADD_NATIVE_PRECOMPILED_HEADER(nelmisc ${CMAKE_CURRENT_SOURCE_DIR}/stdmisc.h ${CMAKE_CURRENT_SOURCE_DIR}/stdmisc.cpp) -ENDIF(WITH_PCH AND NOT WITH_STATIC) NL_GEN_PC(nel-misc.pc) INSTALL(TARGETS nelmisc LIBRARY DESTINATION lib ARCHIVE DESTINATION lib COMPONENT libraries) diff --git a/code/nel/src/misc/rgba.cpp b/code/nel/src/misc/rgba.cpp index 581d7d3f3..4ea71f307 100644 --- a/code/nel/src/misc/rgba.cpp +++ b/code/nel/src/misc/rgba.cpp @@ -639,7 +639,7 @@ bool CRGBA::convertToHLS(float &h, float &l, float &s) const { h = 2.f + (b - r) / diff; } - else + else if (maxV == b) { h = 4.f + (r - g) / diff; }