From 6ac293c8487a85e70bfb900370132d581d8dfc08 Mon Sep 17 00:00:00 2001
From: kervala <devnull@localhost>
Date: Wed, 6 Jan 2016 16:03:04 +0100
Subject: [PATCH] Fixed: Warnings with GCC

---
 code/ryzom/server/src/ai_share/ai_event.h     |  3 +-
 .../screenshot_islands.cpp                    | 29 +++++++++++++------
 2 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/code/ryzom/server/src/ai_share/ai_event.h b/code/ryzom/server/src/ai_share/ai_event.h
index 267d0f456..c62b1be81 100644
--- a/code/ryzom/server/src/ai_share/ai_event.h
+++ b/code/ryzom/server/src/ai_share/ai_event.h
@@ -88,7 +88,8 @@ public:
 	const CAIEventType &operator=(const CAIEventType &other)
 	{
 		_val=other._val;
-	} 
+		return *this;
+	}
 	bool operator==(const CAIEventType &other)	const
 	{
 		return _val==other._val;
diff --git a/code/ryzom/tools/client/r2_islands_textures/screenshot_islands.cpp b/code/ryzom/tools/client/r2_islands_textures/screenshot_islands.cpp
index 617605399..0cf9686b5 100644
--- a/code/ryzom/tools/client/r2_islands_textures/screenshot_islands.cpp
+++ b/code/ryzom/tools/client/r2_islands_textures/screenshot_islands.cpp
@@ -844,6 +844,7 @@ void CScreenshotIslands::processProximityBuffer(TBuffer & inputBuffer, uint32 li
 
 		bool lastValue = false;
 		CVector2f firstPixelBorder;
+		firstPixelBorder.set(0.f, 0.f);
 		uint32 nbPixelsBorder = 0;
 
 		for (uint32 x=0;x<lineLength;++x)
@@ -907,6 +908,7 @@ void CScreenshotIslands::processProximityBuffer(TBuffer & inputBuffer, uint32 li
 	{
 		bool lastValue = false;
 		CVector2f firstPixelBorder;
+		firstPixelBorder.set(0.f, 0.f);
 		uint32 nbPixelsBorder = 0;
 	
 		for(uint32 y=0; y<numLines; y++)
@@ -1379,11 +1381,18 @@ void CScreenshotIslands::buildIslandsTextures()
 	{
 		string seasonSuffix = *itSeason;
 
-		int season;
-		if(seasonSuffix=="_sp") season = CSeason::Spring;
-		else if(seasonSuffix=="_su") season = CSeason::Summer;
-		else if(seasonSuffix=="_au") season = CSeason::Autumn;
-		else if(seasonSuffix=="_wi") season = CSeason::Winter;
+		sint season = -1;
+
+		if (seasonSuffix == "_sp") season = CSeason::Spring;
+		else if (seasonSuffix == "_su") season = CSeason::Summer;
+		else if (seasonSuffix == "_au") season = CSeason::Autumn;
+		else if (seasonSuffix == "_wi") season = CSeason::Winter;
+
+		if (season == -1)
+		{
+			nlwarning("Unknown season suffix %s, skipping...", seasonSuffix.c_str());
+			continue;
+		}
 
 		// Iterations on Continents
 		TContinentsData::iterator itCont(_ContinentsData.begin()), lastCont(_ContinentsData.end());
@@ -1673,11 +1682,9 @@ inline bool RGB2HSV(const CRGBA & rgba, uint & Hue, uint & Sat, uint & Val)
 {
 	double Min_, Max_, Delta, H, S, V;
 	
-	H = 0.0;
 	Min_ = min(min(rgba.R, rgba.G), rgba.B);
 	Max_ = max(max(rgba.R, rgba.G), rgba.B);
 	Delta = ( Max_ - Min_);
-	V = Max_;
 
 	if(Max_ != 0.0)
 	{
@@ -1685,11 +1692,15 @@ inline bool RGB2HSV(const CRGBA & rgba, uint & Hue, uint & Sat, uint & Val)
 	}
 	else
 	{
-		S = 0.0;
-		H = -1;
+		Hue = 0;
+		Sat = 0;
+		Val = 0;
 		return false;
 	}
 
+	H = 0.0;
+	V = Max_;
+
 	if(rgba.R == Max_) 
 	{
 		H = (rgba.G - rgba.B) / Delta;