From 46f8876d27c5a8810af88f0ae10520ae74a264cc Mon Sep 17 00:00:00 2001
From: Michael Lotz <mmlr@mlotz.ch>
Date: Tue, 21 Nov 2017 21:24:07 +0100
Subject: [PATCH] RemoteMessage: Make some message parts fixed size.

So they don't differ across architectures.
---
 src/servers/app/drawing/interface/remote/RemoteMessage.cpp | 6 +++---
 src/servers/app/drawing/interface/remote/RemoteMessage.h   | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/servers/app/drawing/interface/remote/RemoteMessage.cpp b/src/servers/app/drawing/interface/remote/RemoteMessage.cpp
index 178747355f..05859ff28b 100644
--- a/src/servers/app/drawing/interface/remote/RemoteMessage.cpp
+++ b/src/servers/app/drawing/interface/remote/RemoteMessage.cpp
@@ -114,7 +114,7 @@ RemoteMessage::AddBitmap(const ServerBitmap& bitmap, bool minimal)
 void
 RemoteMessage::AddFont(const ServerFont& font)
 {
-	Add(font.Direction());
+	Add((uint8)font.Direction());
 	Add((uint8)font.Encoding());
 	Add(font.Flags());
 	Add((uint8)font.Spacing());
@@ -176,7 +176,7 @@ RemoteMessage::AddBitmap(const BBitmap& bitmap)
 	Add(bounds.IntegerWidth() + 1);
 	Add(bounds.IntegerHeight() + 1);
 	Add(bitmap.BytesPerRow());
-	Add(bitmap.ColorSpace());
+	Add((uint32)bitmap.ColorSpace());
 	Add(bitmap.Flags());
 
 	uint32 bitsLength = bitmap.BitsLength();
@@ -195,7 +195,7 @@ RemoteMessage::AddBitmap(const BBitmap& bitmap)
 void
 RemoteMessage::AddGradient(const BGradient& gradient)
 {
-	Add(gradient.GetType());
+	Add((uint32)gradient.GetType());
 
 	switch (gradient.GetType()) {
 		case BGradient::TYPE_NONE:
diff --git a/src/servers/app/drawing/interface/remote/RemoteMessage.h b/src/servers/app/drawing/interface/remote/RemoteMessage.h
index 3288993903..3e17a1b6c3 100644
--- a/src/servers/app/drawing/interface/remote/RemoteMessage.h
+++ b/src/servers/app/drawing/interface/remote/RemoteMessage.h
@@ -267,7 +267,7 @@ RemoteMessage::Add(const T& value)
 inline void
 RemoteMessage::AddString(const char* string, size_t length)
 {
-	Add(length);
+	Add((uint32)length);
 	if (length > fAvailable && !_MakeSpace(length))
 		return;