More warnings/minor fixes

git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@836 0fc631ac-6414-0410-93d0-97cfa31319b6

src/gfx/blend_image.cpp

@@ -107,7 +107,7 @@ void set_alpha(Image& img, Byte* al, const wxSize& alpha_size) {
 }
 
 void set_alpha(Image& img, double alpha) {
-	Byte b_alpha = alpha * 255;
+	Byte b_alpha = Byte(alpha * 255);
 	if (!img.HasAlpha()) {
 		img.InitAlpha();
 		memset(img.GetAlpha(), b_alpha, img.GetWidth() * img.GetHeight());

src/gfx/generated_image.cpp

@@ -31,7 +31,7 @@ Image conform_image(const Image& img, const GeneratedImage::Options& options) {
 	if ((iw == options.width && ih == options.height) || (options.width == 0 && options.height == 0)) {
 		// zoom?
 		if (options.zoom != 1.0) {
-			image = resample(image, iw * options.zoom, ih * options.zoom);
+			image = resample(image, int(iw * options.zoom), int(ih * options.zoom));
 		} else {
 			// already the right size
 		}

src/gfx/image_effects.cpp

@@ -18,7 +18,7 @@ void saturate(Image& image, double amount) {
 	Byte* end = pix + image.GetWidth() * image.GetHeight() * 3;
 	if (amount > 0) {
 		amount = min(amount,0.99);
-		int factor = 256 * amount;
+		int factor = int(256 * amount);
 		int div    = 768 - 3 * factor;
 		while (pix != end) {
 			int r = pix[0], g = pix[1], b = pix[2];
@@ -35,7 +35,7 @@ void saturate(Image& image, double amount) {
 			pix += 3;
 		}
 	} else {
-		int factor1 = 256 * -amount;
+		int factor1 = int(256 * -amount);
 		int factor2 = 768 - 3*factor1;
 		while (pix != end) {
 			int r = pix[0], g = pix[1], b = pix[2];

src/gfx/resample_text.cpp

@@ -185,8 +185,8 @@ void draw_resampled_text(DC& dc, const RealPoint& pos, const RealRect& rect, dou
 	// get image
 	mdc.SelectObject(wxNullBitmap);
 	// step 2. sample down
-	if (!sideways(angle)) w *= stretch;
-	else                  h *= stretch;
+	if (!sideways(angle)) w = int(w * stretch); // GCC makes annoying conversion warnings if *= is used here.
+	else                  h = int(h * stretch);
 	Image img_small(w, h, false);
 	fill_image(img_small, dc.GetTextForeground());
 	downsample_to_alpha(buffer, img_small);