Merge pull request #362 from glynnc/master

Deal with some warnings

Author: Ghabry

src/bitmap.cpp

@@ -22,9 +22,6 @@
 #include <algorithm>
 #include <iostream>
 
-#include <boost/scope_exit.hpp>
-#include <png.h>
-
 #include "system.h"
 #include "utils.h"
 #include "cache.h"
@@ -88,15 +85,6 @@ Color Bitmap::GetPixel(int x, int y) const {
 	return Color(r, g, b, a);
 }
 
-static void write_data(png_structp out_ptr, png_bytep data, png_size_t len) {
-	reinterpret_cast<std::ostream*>(png_get_io_ptr(out_ptr))->write(
-																	reinterpret_cast<char const*>(data), len);
-}
-static void flush_stream(png_structp out_ptr) {
-	reinterpret_cast<std::ostream*>(png_get_io_ptr(out_ptr))->flush();
-}
-
-
 bool Bitmap::WritePNG(std::ostream& os) const {
 	size_t const width = GetWidth(), height = GetHeight();
 	size_t const stride = width * 4;
@@ -109,50 +97,7 @@ bool Bitmap::WritePNG(std::ostream& os) const {
 	pixman_image_composite32(PIXMAN_OP_SRC, bitmap, NULL, dst.get(),
 							 0, 0, 0, 0, 0, 0, width, height);
 
-	for(size_t i = 0; i < width * height; ++i) {
-		uint32_t const p = data[i];
-		uint8_t* out = reinterpret_cast<uint8_t*>(&data[i]);
-		uint8_t
-			a = (p >> 24) & 0xff, r = (p >> 16) & 0xff,
-			g = (p >>  8) & 0xff, b = (p >>  0) & 0xff;
-		if(a != 0) {
-			r = (r * 255) / a;
-			g = (g * 255) / a;
-			b = (b * 255) / a;
-		}
-		*out++ = r; *out++ = g; *out++ = b; *out++ = a;
-	}
-
-	std::vector<png_bytep> ptrs(height);
-	for(size_t i = 0; i < ptrs.size(); ++i) {
-		ptrs[i] = reinterpret_cast<png_bytep>(&data[width*i]);
-	}
-
-	png_structp write = NULL;
-	if(!(write = png_create_write_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL))) {
-		Output::Warning("Bitmap::WritePNG: error in png_create_write");
-		return false;
-	}
-
-	png_infop info = NULL;
-	BOOST_SCOPE_EXIT((&write)(&info)) {
-		png_destroy_write_struct(&write, &info);
-	} BOOST_SCOPE_EXIT_END do {} while(0);
-	if(!(info = png_create_info_struct(write))) {
-		Output::Warning("Bitmap::WritePNG: error in png_create_info_struct");
-		return false;
-	}
-
-	png_set_write_fn(write, &os, &write_data, &flush_stream);
-
-	png_set_IHDR(write, info, width, height, 8,
-				 PNG_COLOR_TYPE_RGB_ALPHA, PNG_INTERLACE_NONE,
-				 PNG_COMPRESSION_TYPE_BASE, PNG_FILTER_TYPE_BASE);
-	png_write_info(write, info);
-	png_write_image(write, &ptrs.front());
-	png_write_end(write, NULL);
-
-	return true;
+	return ImagePNG::WritePNG(os, width, height, &data.front());
 }
 
 void Bitmap::AttachBitmapScreen(BitmapScreen* bitmap) {
@@ -234,7 +179,7 @@ Bitmap::TileOpacity Bitmap::GetTileOpacity(int row, int col) {
 	return opacity? (*opacity)[row][col] : Partial;
 }
 
-uint8_t Bitmap::bytes() const {
+int Bitmap::bytes() const {
 	return format.bytes;
 }
 
@@ -717,7 +662,7 @@ void const* Bitmap::pixels() const {
 	return (void const*) pixman_image_get_data(bitmap);
 }
 
-uint8_t Bitmap::bpp() const {
+int Bitmap::bpp() const {
 	return (pixman_image_get_depth(bitmap) + 7) / 8;
 }
 
@@ -729,7 +674,7 @@ int Bitmap::height() const {
 	return pixman_image_get_height(bitmap);
 }
 
-uint16_t Bitmap::pitch() const {
+int Bitmap::pitch() const {
 	return pixman_image_get_stride(bitmap);
 }
 

src/bitmap.h

@@ -177,7 +177,7 @@ class Bitmap {
 protected:
 	Bitmap();
 
-	uint8_t bytes() const;
+	int bytes() const;
 	uint32_t rmask() const;
 	uint32_t gmask() const;
 	uint32_t bmask() const;
@@ -701,8 +701,8 @@ class Bitmap {
 	void const* pixels() const;
 	int width() const;
 	int height() const;
-	uint8_t bpp() const;
-	uint16_t pitch() const;
+	int bpp() const;
+	int pitch() const;
 
 protected:
 	/** Bitmap data. */

src/game_character.h

@@ -285,14 +285,14 @@ class Game_Character {
 	 *
 	 * @return flash intensity
 	 */
-	virtual int GetFlashLevel() const = 0;
+	virtual double GetFlashLevel() const = 0;
 
 	/**
 	 * Sets intensity of flash effect.
 	 *
 	 * @param flash_level new flash intensity
 	 */
-	virtual void SetFlashLevel(int flash_level) = 0;
+	virtual void SetFlashLevel(double flash_level) = 0;
 
 	/**
 	 * Returns how many flash effect time is left.

src/game_event.cpp

@@ -209,11 +209,11 @@ void Game_Event::SetFlashColor(const Color& flash_color) {
 	data.flash_green = flash_color.green;
 }
 
-int Game_Event::GetFlashLevel() const {
+double Game_Event::GetFlashLevel() const {
 	return data.flash_current_level;
 }
 
-void Game_Event::SetFlashLevel(int flash_level) {
+void Game_Event::SetFlashLevel(double flash_level) {
 	data.flash_current_level = flash_level;
 }
 

src/game_event.h

@@ -79,8 +79,8 @@ class Game_Event : public Game_Character {
 	void SetSpriteIndex(int index);
 	Color GetFlashColor() const;
 	void SetFlashColor(const Color& flash_color);
-	int GetFlashLevel() const;
-	void SetFlashLevel(int flash_level);
+	double GetFlashLevel() const;
+	void SetFlashLevel(double flash_level);
 	int GetFlashTimeLeft() const;
 	void SetFlashTimeLeft(int time_left);
 	bool IsMessageBlocking() const;

src/game_map.cpp

@@ -916,7 +916,7 @@ void Game_Map::SetChipset(int id) {
 	passages_down = chipset.passable_data_lower;
 	passages_up = chipset.passable_data_upper;
 	animation_type = chipset.animation_type;
-	animation_fast = chipset.animation_speed;
+	animation_fast = chipset.animation_speed != 0;
 	if (passages_down.size() < 162)
 		passages_down.resize(162, (unsigned char) 0x0F);
 	if (passages_up.size() < 144)

src/game_message.cpp

@@ -108,7 +108,7 @@ void Game_Message::SetFaceRightPosition(bool right) {
 }
 
 bool Game_Message::IsTransparent() {
-	return data.message_transparent;
+	return data.message_transparent != 0;
 }
 
 void Game_Message::SetTransparent(bool transparent) {
@@ -132,7 +132,7 @@ void Game_Message::SetPositionFixed(bool fixed) {
 }
 
 bool Game_Message::GetContinueEvents() {
-	return data.message_continue_events;
+	return data.message_continue_events != 0;
 }
 
 void Game_Message::SetContinueEvents(bool continue_events) {

src/game_player.cpp

@@ -179,11 +179,11 @@ void Game_Player::SetFlashColor(const Color& flash_color) {
 	location.flash_green = flash_color.green;
 }
 
-int Game_Player::GetFlashLevel() const {
+double Game_Player::GetFlashLevel() const {
 	return location.flash_current_level;
 }
 
-void Game_Player::SetFlashLevel(int flash_level) {
+void Game_Player::SetFlashLevel(double flash_level) {
 	location.flash_current_level = flash_level;
 }
 

src/game_player.h

@@ -69,8 +69,8 @@ class Game_Player : public Game_Character {
 	void SetSpriteIndex(int index);
 	Color GetFlashColor() const;
 	void SetFlashColor(const Color& flash_color);
-	int GetFlashLevel() const;
-	void SetFlashLevel(int flash_level);
+	double GetFlashLevel() const;
+	void SetFlashLevel(double flash_level);
 	int GetFlashTimeLeft() const;
 	void SetFlashTimeLeft(int time_left);
 	/** @} */

src/game_vehicle.cpp

@@ -174,11 +174,11 @@ void Game_Vehicle::SetFlashColor(const Color& flash_color) {
 	data.flash_green = flash_color.green;
 }
 
-int Game_Vehicle::GetFlashLevel() const {
+double Game_Vehicle::GetFlashLevel() const {
 	return data.flash_current_level;
 }
 
-void Game_Vehicle::SetFlashLevel(int flash_level) {
+void Game_Vehicle::SetFlashLevel(double flash_level) {
 	data.flash_current_level = flash_level;
 }
 

src/game_vehicle.h

@@ -77,8 +77,8 @@ class Game_Vehicle : public Game_Character {
 	void SetSpriteIndex(int index);
 	Color GetFlashColor() const;
 	void SetFlashColor(const Color& flash_color);
-	int GetFlashLevel() const;
-	void SetFlashLevel(int flash_level);
+	double GetFlashLevel() const;
+	void SetFlashLevel(double flash_level);
 	int GetFlashTimeLeft() const;
 	void SetFlashTimeLeft(int time_left);
 	/** @} */

src/image_png.cpp

@@ -22,6 +22,9 @@
 #include <png.h>
 #include <cstdlib>
 #include <cstring>
+#include <csetjmp>
+#include <vector>
+
 #include "output.h"
 #include "image_png.h"
 
@@ -139,4 +142,63 @@ void ImagePNG::ReadPNG(FILE* stream, const void* buffer, bool transparent,
 	png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
 }
 
+static void write_data(png_structp out_ptr, png_bytep data, png_size_t len) {
+	reinterpret_cast<std::ostream*>(png_get_io_ptr(out_ptr))->write(reinterpret_cast<char const*>(data), len);
+}
+static void flush_stream(png_structp out_ptr) {
+	reinterpret_cast<std::ostream*>(png_get_io_ptr(out_ptr))->flush();
+}
+
+bool ImagePNG::WritePNG(std::ostream& os, int width, int height, uint32_t* data) {
+	for (size_t i = 0; i < width * height; ++i) {
+		uint32_t const p = data[i];
+		uint8_t* out = reinterpret_cast<uint8_t*>(&data[i]);
+		uint8_t
+			a = (p >> 24) & 0xff, r = (p >> 16) & 0xff,
+			g = (p >>  8) & 0xff, b = (p >>  0) & 0xff;
+		if(a != 0) {
+			r = (r * 255) / a;
+			g = (g * 255) / a;
+			b = (b * 255) / a;
+		}
+		*out++ = r; *out++ = g; *out++ = b; *out++ = a;
+	}
+
+	png_structp write = png_create_write_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
+	if (!write) {
+		Output::Warning("Bitmap::WritePNG: error in png_create_write");
+		return false;
+	}
+
+	png_infop info = png_create_info_struct(write);
+	if (!info) {
+		png_destroy_write_struct(&write, &info);
+		Output::Warning("ImagePNG::WritePNG: error in png_create_info_struct");
+		return false;
+	}
+
+	png_bytep* ptrs = new png_bytep[height];
+	for (size_t i = 0; i < height; ++i) {
+		ptrs[i] = reinterpret_cast<png_bytep>(&data[width*i]);
+	}
+
+	if (setjmp(png_jmpbuf(write))) {
+		png_destroy_write_struct(&write, &info);
+		delete [] ptrs;
+		Output::Warning("ImagePNG::WritePNG: error writing PNG file");
+		return false;
+	}
+
+	png_set_write_fn(write, &os, &write_data, &flush_stream);
+
+	png_set_IHDR(write, info, width, height, 8,
+				 PNG_COLOR_TYPE_RGB_ALPHA, PNG_INTERLACE_NONE,
+				 PNG_COMPRESSION_TYPE_BASE, PNG_FILTER_TYPE_BASE);
+	png_write_info(write, info);
+	png_write_image(write, ptrs);
+	png_write_end(write, NULL);
+
+	return true;
+}
+
 #endif // SUPPORT_PNG

src/image_png.h

@@ -22,10 +22,12 @@
 #ifdef SUPPORT_PNG
 
 #include <cstdio>
+#include <ostream>
 #include "system.h"
 
 namespace ImagePNG {
 	void ReadPNG(FILE* stream, const void* buffer, bool transparent, int& width, int& height, void*& pixels);
+	bool WritePNG(std::ostream& os, int width, int height, uint32_t* data);
 }
 
 #endif // SUPPORT_PNG

src/window_message.cpp

@@ -43,6 +43,11 @@
 const int Window_Message::speed_table[21] = {0, 0, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6,
 											7, 7, 8, 8, 9, 9, 10, 10, 11};
 
+// C4428 is nonsense
+#ifdef _MSC_VER
+#pragma warning (disable : 4428)
+#endif
+
 Window_Message::Window_Message(int ix, int iy, int iwidth, int iheight) :
 	Window_Selectable(ix, iy, iwidth, iheight),
 	contents_x(0), contents_y(0), line_count(0), text(""),
@@ -57,9 +62,9 @@ Window_Message::Window_Message(int ix, int iy, int iwidth, int iheight) :
 	visible = false;
 	SetZ(10000);
 
-	escape_char = (Player::escape_symbol == "\u00A5" ? L'¥' :
-		      (Player::escape_symbol == "\u20A9" ? L'₩' :
-		      '\\'));
+	escape_char = (Player::escape_symbol == "\xC2\xA5" ? L'\u00A5' :
+		      (Player::escape_symbol == "\xE2\x82\xA9" ? L'\u20A9' :
+		      L'\\'));
 	active = false;
 	index = -1;
 	text_color = Font::ColorDefault;