Merge lp:~widelands-dev/widelands/use_sdl_image_in_one_place into lp:widelands

[SirVer]

This is part of chained branches. The base branch needs to be submitted first.

Only image_io depends on SDL_Image. This is the way it should be.

[GunChleoc (gunchleoc)]

Added a streamlining idea.

[SirVer (sirver)]

Very reasonable suggestion. Done.

[SirVer (sirver)]

review: Needs Resubmitting

[GunChleoc (gunchleoc)]

LGTM

review: Approve

=== modified file 'src/map_io/CMakeLists.txt'
--- src/map_io/CMakeLists.txt	2014-11-28 16:40:55 +0000
+++ src/map_io/CMakeLists.txt	2014-12-01 21:31:32 +0000
@@ -84,7 +84,6 @@
     map_terrain_packet.h
     map_version_packet.cc
     map_version_packet.h
-  USES_SDL2_IMAGE
   DEPENDS
     base_exceptions
     base_log

=== modified file 'src/map_io/map_extradata_packet.cc'
--- src/map_io/map_extradata_packet.cc	2014-11-28 05:40:53 +0000
+++ src/map_io/map_extradata_packet.cc	2014-12-01 21:31:32 +0000
@@ -19,9 +19,8 @@
 
 #include "map_io/map_extradata_packet.h"
 
-#include <SDL_image.h>
-
 #include "graphic/graphic.h"
+#include "graphic/image_io.h"
 #include "graphic/in_memory_image.h"
 #include "graphic/texture.h"
 #include "io/fileread.h"
@@ -60,14 +59,7 @@
 					const std::string hash = std::string("map:") + FileSystem::fs_filename(pname->c_str());
 					const Image* image = nullptr;
 					if (!g_gr->images().has(hash)) {
-						FileRead fr;
-
-						fr.open(fs, *pname);
-						SDL_Surface * const surf =
-							IMG_Load_RW(SDL_RWFromMem(fr.data(0), fr.get_size()), 1);
-						if (!surf)
-							continue; //  Illegal pic. Skip it.
-						image = g_gr->images().insert(new_in_memory_image(hash, new Texture(surf)));
+						image = g_gr->images().insert(new_in_memory_image(hash, load_image(*pname, &fs)));
 					} else {
 						image = g_gr->images().get(hash);
 					}