WORD -> uint16_t

22 files changed, 91 insertions, 91 deletions

diff --git a/libs/freeimage/src/FreeImage/BitmapAccess.cpp b/libs/freeimage/src/FreeImage/BitmapAccess.cpp
index 4f5fea576a..62a1d216aa 100644
--- a/libs/freeimage/src/FreeImage/BitmapAccess.cpp
+++ b/libs/freeimage/src/FreeImage/BitmapAccess.cpp
@@ -428,7 +428,7 @@ FreeImage_AllocateBitmap(BOOL header_only, uint8_t *ext_bits, unsigned ext_pitch
 			bih->biHeight           = height;
 			bih->biPlanes           = 1;
 			bih->biCompression      = need_masks ? BI_BITFIELDS : BI_RGB;
-			bih->biBitCount         = (WORD)bpp;
+			bih->biBitCount         = (uint16_t)bpp;
 			bih->biClrUsed          = CalculateUsedPaletteEntries(bpp);
 			bih->biClrImportant     = bih->biClrUsed;
 			bih->biXPelsPerMeter	= 2835;	// 72 dpi
@@ -1379,7 +1379,7 @@ FreeImage_SetMetadata(FREE_IMAGE_MDMODEL model, FIBITMAP *dib, const char *key,
 						FreeImage_OutputMessageProc(FIF_UNKNOWN, "IPTC: Invalid key '%s'", key);
 					}
 					*/
-					FreeImage_SetTagID(tag, (WORD)id);
+					FreeImage_SetTagID(tag, (uint16_t)id);
 				}
 				break;
 
diff --git a/libs/freeimage/src/FreeImage/Conversion.cpp b/libs/freeimage/src/FreeImage/Conversion.cpp
index 7a700b2e48..e9481c5401 100644
--- a/libs/freeimage/src/FreeImage/Conversion.cpp
+++ b/libs/freeimage/src/FreeImage/Conversion.cpp
@@ -87,7 +87,7 @@ BOOL SwapRedBlue32(FIBITMAP* dib) {
 // ----------------------------------------------------------
 
 static inline void 
-assignRGB(WORD r, WORD g, WORD b, WORD* out) {
+assignRGB(uint16_t r, uint16_t g, uint16_t b, uint16_t* out) {
 	out[0] = r;
 	out[1] = g;
 	out[2] = b;
@@ -162,7 +162,7 @@ ConvertCMYKtoRGBA(FIBITMAP* dib) {
 	
 	unsigned channelSize = 1;
 	if (image_type == FIT_RGBA16 || image_type == FIT_RGB16) {
-		channelSize = sizeof(WORD);
+		channelSize = sizeof(uint16_t);
 	} else if (!(image_type == FIT_BITMAP && (bytesperpixel > 2))) {
 		return FALSE;
 	}
@@ -174,8 +174,8 @@ ConvertCMYKtoRGBA(FIBITMAP* dib) {
 	
 	unsigned samplesperpixel = FreeImage_GetLine(dib) / width / channelSize;
 
-	if(channelSize == sizeof(WORD)) {
-		_convertCMYKtoRGBA<WORD>(width, height, line_start, pitch, samplesperpixel);
+	if(channelSize == sizeof(uint16_t)) {
+		_convertCMYKtoRGBA<uint16_t>(width, height, line_start, pitch, samplesperpixel);
 	} else {
 		_convertCMYKtoRGBA<uint8_t>(width, height, line_start, pitch, samplesperpixel);
 	}
@@ -311,7 +311,7 @@ ConvertLABtoRGB(FIBITMAP* dib) {
 	
 	unsigned channelSize = 1;
 	if (image_type == FIT_RGBA16 || image_type == FIT_RGB16) {
-		channelSize = sizeof(WORD);
+		channelSize = sizeof(uint16_t);
 	} else if (!(image_type == FIT_BITMAP && (bytesperpixel > 2))) {
 		return FALSE;
 	}
@@ -327,7 +327,7 @@ ConvertLABtoRGB(FIBITMAP* dib) {
 		_convertLABtoRGB<uint8_t>(width, height, line_start, pitch, samplesperpixel);
 	}
 	else {
-		_convertLABtoRGB<WORD>(width, height, line_start, pitch, samplesperpixel);
+		_convertLABtoRGB<uint16_t>(width, height, line_start, pitch, samplesperpixel);
 	}
 
 	return TRUE;	
diff --git a/libs/freeimage/src/FreeImage/Conversion16_555.cpp b/libs/freeimage/src/FreeImage/Conversion16_555.cpp
index ae0a4b6d1a..2caa76e9cf 100644
--- a/libs/freeimage/src/FreeImage/Conversion16_555.cpp
+++ b/libs/freeimage/src/FreeImage/Conversion16_555.cpp
@@ -33,7 +33,7 @@
 
 void DLL_CALLCONV
 FreeImage_ConvertLine1To16_555(uint8_t *target, uint8_t *source, int width_in_pixels, RGBQUAD *palette) {
-	WORD *new_bits = (WORD *)target;
+	uint16_t *new_bits = (uint16_t *)target;
 
 	for (int cols = 0; cols < width_in_pixels; cols++) {
 		int index = (source[cols >> 3] & (0x80 >> (cols & 0x07))) != 0 ? 1 : 0;
@@ -44,7 +44,7 @@ FreeImage_ConvertLine1To16_555(uint8_t *target, uint8_t *source, int width_in_pi
 
 void DLL_CALLCONV
 FreeImage_ConvertLine4To16_555(uint8_t *target, uint8_t *source, int width_in_pixels, RGBQUAD *palette) {
-	WORD *new_bits = (WORD *)target;
+	uint16_t *new_bits = (uint16_t *)target;
 	BOOL lonibble = FALSE;
 	int x = 0;
 
@@ -65,7 +65,7 @@ FreeImage_ConvertLine4To16_555(uint8_t *target, uint8_t *source, int width_in_pi
 
 void DLL_CALLCONV
 FreeImage_ConvertLine8To16_555(uint8_t *target, uint8_t *source, int width_in_pixels, RGBQUAD *palette) {
-	WORD *new_bits = (WORD *)target;
+	uint16_t *new_bits = (uint16_t *)target;
 
 	for (int cols = 0; cols < width_in_pixels; cols++) {
 		RGBQUAD *grab_palette = palette + source[cols];
@@ -76,8 +76,8 @@ FreeImage_ConvertLine8To16_555(uint8_t *target, uint8_t *source, int width_in_pi
 
 void DLL_CALLCONV
 FreeImage_ConvertLine16_565_To16_555(uint8_t *target, uint8_t *source, int width_in_pixels) {
-	WORD *src_bits = (WORD *)source;
-	WORD *new_bits = (WORD *)target;
+	uint16_t *src_bits = (uint16_t *)source;
+	uint16_t *new_bits = (uint16_t *)target;
 
 	for (int cols = 0; cols < width_in_pixels; cols++) {
 		new_bits[cols] = RGB555((((src_bits[cols] & FI16_565_BLUE_MASK) >> FI16_565_BLUE_SHIFT) * 0xFF) / 0x1F,
@@ -88,7 +88,7 @@ FreeImage_ConvertLine16_565_To16_555(uint8_t *target, uint8_t *source, int width
 
 void DLL_CALLCONV
 FreeImage_ConvertLine24To16_555(uint8_t *target, uint8_t *source, int width_in_pixels) {
-	WORD *new_bits = (WORD *)target;
+	uint16_t *new_bits = (uint16_t *)target;
 
 	for (int cols = 0; cols < width_in_pixels; cols++) {
 		new_bits[cols] = RGB555(source[FI_RGBA_BLUE], source[FI_RGBA_GREEN], source[FI_RGBA_RED]);
@@ -99,7 +99,7 @@ FreeImage_ConvertLine24To16_555(uint8_t *target, uint8_t *source, int width_in_p
 
 void DLL_CALLCONV
 FreeImage_ConvertLine32To16_555(uint8_t *target, uint8_t *source, int width_in_pixels) {
-	WORD *new_bits = (WORD *)target;
+	uint16_t *new_bits = (uint16_t *)target;
 
 	for (int cols = 0; cols < width_in_pixels; cols++) {
 		new_bits[cols] = RGB555(source[FI_RGBA_BLUE], source[FI_RGBA_GREEN], source[FI_RGBA_RED]);
diff --git a/libs/freeimage/src/FreeImage/Conversion16_565.cpp b/libs/freeimage/src/FreeImage/Conversion16_565.cpp
index e48d53b7ad..0a36fdaa8b 100644
--- a/libs/freeimage/src/FreeImage/Conversion16_565.cpp
+++ b/libs/freeimage/src/FreeImage/Conversion16_565.cpp
@@ -29,7 +29,7 @@
 
 void DLL_CALLCONV
 FreeImage_ConvertLine1To16_565(uint8_t *target, uint8_t *source, int width_in_pixels, RGBQUAD *palette) {
-	WORD *new_bits = (WORD *)target;
+	uint16_t *new_bits = (uint16_t *)target;
 
 	for (int cols = 0; cols < width_in_pixels; cols++) {
 		int index = (source[cols >> 3] & (0x80 >> (cols & 0x07))) != 0 ? 1 : 0;
@@ -40,7 +40,7 @@ FreeImage_ConvertLine1To16_565(uint8_t *target, uint8_t *source, int width_in_pi
 
 void DLL_CALLCONV
 FreeImage_ConvertLine4To16_565(uint8_t *target, uint8_t *source, int width_in_pixels, RGBQUAD *palette) {
-	WORD *new_bits = (WORD *)target;
+	uint16_t *new_bits = (uint16_t *)target;
 	BOOL lonibble = FALSE;
 	int x = 0;
 
@@ -61,7 +61,7 @@ FreeImage_ConvertLine4To16_565(uint8_t *target, uint8_t *source, int width_in_pi
 
 void DLL_CALLCONV
 FreeImage_ConvertLine8To16_565(uint8_t *target, uint8_t *source, int width_in_pixels, RGBQUAD *palette) {
-	WORD *new_bits = (WORD *)target;
+	uint16_t *new_bits = (uint16_t *)target;
 
 	for (int cols = 0; cols < width_in_pixels; cols++) {
 		RGBQUAD *grab_palette = palette + source[cols];
@@ -72,8 +72,8 @@ FreeImage_ConvertLine8To16_565(uint8_t *target, uint8_t *source, int width_in_pi
 
 void DLL_CALLCONV
 FreeImage_ConvertLine16_555_To16_565(uint8_t *target, uint8_t *source, int width_in_pixels) {
-	WORD *src_bits = (WORD *)source;
-	WORD *new_bits = (WORD *)target;
+	uint16_t *src_bits = (uint16_t *)source;
+	uint16_t *new_bits = (uint16_t *)target;
 
 	for (int cols = 0; cols < width_in_pixels; cols++) {
 		new_bits[cols] = RGB565((((src_bits[cols] & FI16_555_BLUE_MASK) >> FI16_555_BLUE_SHIFT) * 0xFF) / 0x1F,
@@ -84,7 +84,7 @@ FreeImage_ConvertLine16_555_To16_565(uint8_t *target, uint8_t *source, int width
 
 void DLL_CALLCONV
 FreeImage_ConvertLine24To16_565(uint8_t *target, uint8_t *source, int width_in_pixels) {
-	WORD *new_bits = (WORD *)target;
+	uint16_t *new_bits = (uint16_t *)target;
 
 	for (int cols = 0; cols < width_in_pixels; cols++) {
 		new_bits[cols] = RGB565(source[FI_RGBA_BLUE], source[FI_RGBA_GREEN], source[FI_RGBA_RED]);
@@ -95,7 +95,7 @@ FreeImage_ConvertLine24To16_565(uint8_t *target, uint8_t *source, int width_in_p
 
 void DLL_CALLCONV
 FreeImage_ConvertLine32To16_565(uint8_t *target, uint8_t *source, int width_in_pixels) {
-	WORD *new_bits = (WORD *)target;
+	uint16_t *new_bits = (uint16_t *)target;
 
 	for (int cols = 0; cols < width_in_pixels; cols++) {
 		new_bits[cols] = RGB565(source[FI_RGBA_BLUE], source[FI_RGBA_GREEN], source[FI_RGBA_RED]);
diff --git a/libs/freeimage/src/FreeImage/Conversion24.cpp b/libs/freeimage/src/FreeImage/Conversion24.cpp
index 9586d853dd..4520e6cae2 100644
--- a/libs/freeimage/src/FreeImage/Conversion24.cpp
+++ b/libs/freeimage/src/FreeImage/Conversion24.cpp
@@ -78,7 +78,7 @@ FreeImage_ConvertLine8To24(uint8_t *target, uint8_t *source, int width_in_pixels
 
 void DLL_CALLCONV
 FreeImage_ConvertLine16To24_555(uint8_t *target, uint8_t *source, int width_in_pixels) {
-	WORD *bits = (WORD *)source;
+	uint16_t *bits = (uint16_t *)source;
 
 	for (int cols = 0; cols < width_in_pixels; cols++) {
 		target[FI_RGBA_RED]   = (uint8_t)((((bits[cols] & FI16_555_RED_MASK) >> FI16_555_RED_SHIFT) * 0xFF) / 0x1F);
@@ -91,7 +91,7 @@ FreeImage_ConvertLine16To24_555(uint8_t *target, uint8_t *source, int width_in_p
 
 void DLL_CALLCONV
 FreeImage_ConvertLine16To24_565(uint8_t *target, uint8_t *source, int width_in_pixels) {
-	WORD *bits = (WORD *)source;
+	uint16_t *bits = (uint16_t *)source;
 
 	for (int cols = 0; cols < width_in_pixels; cols++) {
 		target[FI_RGBA_RED]   = (uint8_t)((((bits[cols] & FI16_565_RED_MASK) >> FI16_565_RED_SHIFT) * 0xFF) / 0x1F);
diff --git a/libs/freeimage/src/FreeImage/Conversion32.cpp b/libs/freeimage/src/FreeImage/Conversion32.cpp
index 43845e19aa..52b85d097d 100644
--- a/libs/freeimage/src/FreeImage/Conversion32.cpp
+++ b/libs/freeimage/src/FreeImage/Conversion32.cpp
@@ -79,7 +79,7 @@ FreeImage_ConvertLine8To32(uint8_t *target, uint8_t *source, int width_in_pixels
 
 void DLL_CALLCONV
 FreeImage_ConvertLine16To32_555(uint8_t *target, uint8_t *source, int width_in_pixels) {
-	WORD *bits = (WORD *)source;
+	uint16_t *bits = (uint16_t *)source;
 
 	for (int cols = 0; cols < width_in_pixels; cols++) {
 		target[FI_RGBA_RED]   = (uint8_t)((((bits[cols] & FI16_555_RED_MASK) >> FI16_555_RED_SHIFT) * 0xFF) / 0x1F);
@@ -92,7 +92,7 @@ FreeImage_ConvertLine16To32_555(uint8_t *target, uint8_t *source, int width_in_p
 
 void DLL_CALLCONV
 FreeImage_ConvertLine16To32_565(uint8_t *target, uint8_t *source, int width_in_pixels) {
-	WORD *bits = (WORD *)source;
+	uint16_t *bits = (uint16_t *)source;
 
 	for (int cols = 0; cols < width_in_pixels; cols++) {
 		target[FI_RGBA_RED]   = (uint8_t)((((bits[cols] & FI16_565_RED_MASK) >> FI16_565_RED_SHIFT) * 0xFF) / 0x1F);
diff --git a/libs/freeimage/src/FreeImage/Conversion4.cpp b/libs/freeimage/src/FreeImage/Conversion4.cpp
index c1527810d6..a96f6b8d5c 100644
--- a/libs/freeimage/src/FreeImage/Conversion4.cpp
+++ b/libs/freeimage/src/FreeImage/Conversion4.cpp
@@ -59,7 +59,7 @@ FreeImage_ConvertLine8To4(uint8_t *target, uint8_t *source, int width_in_pixels,
 
 void DLL_CALLCONV
 FreeImage_ConvertLine16To4_555(uint8_t *target, uint8_t *source, int width_in_pixels) {
-	WORD *bits = (WORD *)source;
+	uint16_t *bits = (uint16_t *)source;
 	BOOL hinibble = TRUE;
 
 	for (int cols = 0; cols < width_in_pixels; cols++) {
@@ -81,7 +81,7 @@ FreeImage_ConvertLine16To4_555(uint8_t *target, uint8_t *source, int width_in_pi
 
 void DLL_CALLCONV
 FreeImage_ConvertLine16To4_565(uint8_t *target, uint8_t *source, int width_in_pixels) {
-	WORD *bits = (WORD *)source;
+	uint16_t *bits = (uint16_t *)source;
 	BOOL hinibble = TRUE;
 
 	for (int cols = 0; cols < width_in_pixels; cols++) {
diff --git a/libs/freeimage/src/FreeImage/Conversion8.cpp b/libs/freeimage/src/FreeImage/Conversion8.cpp
index 73820a4d66..e20fb0a756 100644
--- a/libs/freeimage/src/FreeImage/Conversion8.cpp
+++ b/libs/freeimage/src/FreeImage/Conversion8.cpp
@@ -55,7 +55,7 @@ FreeImage_ConvertLine4To8(uint8_t *target, uint8_t *source, int width_in_pixels)
 
 void DLL_CALLCONV
 FreeImage_ConvertLine16To8_555(uint8_t *target, uint8_t *source, int width_in_pixels) {
-	const WORD *const bits = (WORD *)source;
+	const uint16_t *const bits = (uint16_t *)source;
 	for (unsigned cols = 0; cols < (unsigned)width_in_pixels; cols++) {
 		target[cols] = GREY((((bits[cols] & FI16_555_RED_MASK) >> FI16_555_RED_SHIFT) * 0xFF) / 0x1F,
 			                (((bits[cols] & FI16_555_GREEN_MASK) >> FI16_555_GREEN_SHIFT) * 0xFF) / 0x1F,
@@ -65,7 +65,7 @@ FreeImage_ConvertLine16To8_555(uint8_t *target, uint8_t *source, int width_in_pi
 
 void DLL_CALLCONV
 FreeImage_ConvertLine16To8_565(uint8_t *target, uint8_t *source, int width_in_pixels) {
-	const WORD *const bits = (WORD *)source;
+	const uint16_t *const bits = (uint16_t *)source;
 	for (unsigned cols = 0; cols < (unsigned)width_in_pixels; cols++) {
 		target[cols] = GREY((((bits[cols] & FI16_565_RED_MASK) >> FI16_565_RED_SHIFT) * 0xFF) / 0x1F,
 			        (((bits[cols] & FI16_565_GREEN_MASK) >> FI16_565_GREEN_SHIFT) * 0xFF) / 0x3F,
@@ -204,7 +204,7 @@ FreeImage_ConvertTo8Bits(FIBITMAP *dib) {
 			uint8_t *dst_bits = FreeImage_GetBits(new_dib);
 
 			for (unsigned rows = 0; rows < height; rows++) {
-				const WORD *const src_pixel = (WORD*)src_bits;
+				const uint16_t *const src_pixel = (uint16_t*)src_bits;
 				uint8_t *dst_pixel = (uint8_t*)dst_bits;
 				for(unsigned cols = 0; cols < width; cols++) {
 					dst_pixel[cols] = (uint8_t)(src_pixel[cols] >> 8);
diff --git a/libs/freeimage/src/FreeImage/ConversionFloat.cpp b/libs/freeimage/src/FreeImage/ConversionFloat.cpp
index ca551ab4ad..83fd777271 100644
--- a/libs/freeimage/src/FreeImage/ConversionFloat.cpp
+++ b/libs/freeimage/src/FreeImage/ConversionFloat.cpp
@@ -104,7 +104,7 @@ FreeImage_ConvertToFloat(FIBITMAP *dib) {
 		case FIT_UINT16:
 		{
 			for(unsigned y = 0; y < height; y++) {
-				const WORD *src_pixel = (WORD*)src_bits;
+				const uint16_t *src_pixel = (uint16_t*)src_bits;
 				float *dst_pixel = (float*)dst_bits;
 
 				for(unsigned x = 0; x < width; x++) {
diff --git a/libs/freeimage/src/FreeImage/ConversionRGB16.cpp b/libs/freeimage/src/FreeImage/ConversionRGB16.cpp
index 4852a58866..f748dd1155 100644
--- a/libs/freeimage/src/FreeImage/ConversionRGB16.cpp
+++ b/libs/freeimage/src/FreeImage/ConversionRGB16.cpp
@@ -103,7 +103,7 @@ FreeImage_ConvertToRGB16(FIBITMAP *dib) {
 		case FIT_UINT16:
 		{
 			for(unsigned y = 0; y < height; y++) {
-				const WORD *src_bits = (WORD*)FreeImage_GetScanLine(src, y);
+				const uint16_t *src_bits = (uint16_t*)FreeImage_GetScanLine(src, y);
 				FIRGB16 *dst_bits = (FIRGB16*)FreeImage_GetScanLine(dst, y);
 				for(unsigned x = 0; x < width; x++) {
 					// convert by copying greyscale channel to each R, G, B channels
diff --git a/libs/freeimage/src/FreeImage/ConversionRGBA16.cpp b/libs/freeimage/src/FreeImage/ConversionRGBA16.cpp
index c5ecfdf438..d28d842ab9 100644
--- a/libs/freeimage/src/FreeImage/ConversionRGBA16.cpp
+++ b/libs/freeimage/src/FreeImage/ConversionRGBA16.cpp
@@ -104,7 +104,7 @@ FreeImage_ConvertToRGBA16(FIBITMAP *dib) {
 		case FIT_UINT16:
 		{
 			for(unsigned y = 0; y < height; y++) {
-				const WORD *src_bits = (WORD*)FreeImage_GetScanLine(src, y);
+				const uint16_t *src_bits = (uint16_t*)FreeImage_GetScanLine(src, y);
 				FIRGBA16 *dst_bits = (FIRGBA16*)FreeImage_GetScanLine(dst, y);
 				for(unsigned x = 0; x < width; x++) {
 					// convert by copying greyscale channel to each R, G, B channels
diff --git a/libs/freeimage/src/FreeImage/ConversionRGBAF.cpp b/libs/freeimage/src/FreeImage/ConversionRGBAF.cpp
index 99ece4604d..b8979cc85b 100644
--- a/libs/freeimage/src/FreeImage/ConversionRGBAF.cpp
+++ b/libs/freeimage/src/FreeImage/ConversionRGBAF.cpp
@@ -132,7 +132,7 @@ FreeImage_ConvertToRGBAF(FIBITMAP *dib) {
 			uint8_t *dst_bits = (uint8_t*)FreeImage_GetBits(dst);
 
 			for(unsigned y = 0; y < height; y++) {
-				const WORD *src_pixel = (WORD*)src_bits;
+				const uint16_t *src_pixel = (uint16_t*)src_bits;
 				FIRGBAF *dst_pixel = (FIRGBAF*)dst_bits;
 
 				for(unsigned x = 0; x < width; x++) {
diff --git a/libs/freeimage/src/FreeImage/ConversionRGBF.cpp b/libs/freeimage/src/FreeImage/ConversionRGBF.cpp
index d1f7611caa..bc24ce2b51 100644
--- a/libs/freeimage/src/FreeImage/ConversionRGBF.cpp
+++ b/libs/freeimage/src/FreeImage/ConversionRGBF.cpp
@@ -130,7 +130,7 @@ FreeImage_ConvertToRGBF(FIBITMAP *dib) {
 			uint8_t *dst_bits = (uint8_t*)FreeImage_GetBits(dst);
 
 			for(unsigned y = 0; y < height; y++) {
-				const WORD *src_pixel = (WORD*)src_bits;
+				const uint16_t *src_pixel = (uint16_t*)src_bits;
 				FIRGBF *dst_pixel = (FIRGBF*)dst_bits;
 
 				for(unsigned x = 0; x < width; x++) {
diff --git a/libs/freeimage/src/FreeImage/ConversionUINT16.cpp b/libs/freeimage/src/FreeImage/ConversionUINT16.cpp
index 35f1e2fdd0..2c0562ce89 100644
--- a/libs/freeimage/src/FreeImage/ConversionUINT16.cpp
+++ b/libs/freeimage/src/FreeImage/ConversionUINT16.cpp
@@ -86,7 +86,7 @@ FreeImage_ConvertToUINT16(FIBITMAP *dib) {
 		{
 			for(unsigned y = 0; y < height; y++) {
 				const uint8_t *src_bits = (uint8_t*)FreeImage_GetScanLine(src, y);
-				WORD *dst_bits = (WORD*)FreeImage_GetScanLine(dst, y);
+				uint16_t *dst_bits = (uint16_t*)FreeImage_GetScanLine(dst, y);
 				for(unsigned x = 0; x < width; x++) {
 					dst_bits[x] = src_bits[x] << 8;
 				}
@@ -98,10 +98,10 @@ FreeImage_ConvertToUINT16(FIBITMAP *dib) {
 		{
 			for(unsigned y = 0; y < height; y++) {
 				const FIRGB16 *src_bits = (FIRGB16*)FreeImage_GetScanLine(src, y);
-				WORD *dst_bits = (WORD*)FreeImage_GetScanLine(dst, y);
+				uint16_t *dst_bits = (uint16_t*)FreeImage_GetScanLine(dst, y);
 				for(unsigned x = 0; x < width; x++) {
 					// convert to grey
-					dst_bits[x] = (WORD)LUMA_REC709(src_bits[x].red, src_bits[x].green, src_bits[x].blue);
+					dst_bits[x] = (uint16_t)LUMA_REC709(src_bits[x].red, src_bits[x].green, src_bits[x].blue);
 				}
 			}
 		}
@@ -111,10 +111,10 @@ FreeImage_ConvertToUINT16(FIBITMAP *dib) {
 		{
 			for(unsigned y = 0; y < height; y++) {
 				const FIRGBA16 *src_bits = (FIRGBA16*)FreeImage_GetScanLine(src, y);
-				WORD *dst_bits = (WORD*)FreeImage_GetScanLine(dst, y);
+				uint16_t *dst_bits = (uint16_t*)FreeImage_GetScanLine(dst, y);
 				for(unsigned x = 0; x < width; x++) {
 					// convert to grey
-					dst_bits[x] = (WORD)LUMA_REC709(src_bits[x].red, src_bits[x].green, src_bits[x].blue);
+					dst_bits[x] = (uint16_t)LUMA_REC709(src_bits[x].red, src_bits[x].green, src_bits[x].blue);
 				}
 			}
 		}
diff --git a/libs/freeimage/src/FreeImage/MNGHelper.cpp b/libs/freeimage/src/FreeImage/MNGHelper.cpp
index d89ec23c6b..865cbe38c7 100644
--- a/libs/freeimage/src/FreeImage/MNGHelper.cpp
+++ b/libs/freeimage/src/FreeImage/MNGHelper.cpp
@@ -241,7 +241,7 @@ mng_GetChunckType(const uint8_t *mChunkName) {
 }
 
 inline void
-mng_SwapShort(WORD *sp) {
+mng_SwapShort(uint16_t *sp) {
 #ifndef FREEIMAGE_BIGENDIAN
 	SwapShort(sp);
 #endif
@@ -786,7 +786,7 @@ mng_ReadChunks(int format_id, FreeImageIO *io, fi_handle handle, long Offset, in
 	DWORD res_x = 2835;	// 72 dpi
 	DWORD res_y = 2835;	// 72 dpi
 	RGBQUAD rgbBkColor = {0, 0, 0, 0};
-	WORD bk_red, bk_green, bk_blue;
+	uint16_t bk_red, bk_green, bk_blue;
 	BOOL hasBkColor = FALSE;
 	BOOL mHasIDAT = FALSE;
 
diff --git a/libs/freeimage/src/FreeImage/NNQuantizer.cpp b/libs/freeimage/src/FreeImage/NNQuantizer.cpp
index 092bad23b8..c91d01b053 100644
--- a/libs/freeimage/src/FreeImage/NNQuantizer.cpp
+++ b/libs/freeimage/src/FreeImage/NNQuantizer.cpp
@@ -489,11 +489,11 @@ FIBITMAP* NNQuantizer::Quantize(FIBITMAP *dib, int ReserveSize, RGBQUAD *Reserve
 
 	// 6) Write output image using inxsearch(b,g,r)
 
-	for (WORD rows = 0; rows < img_height; rows++) {
+	for (uint16_t rows = 0; rows < img_height; rows++) {
 		uint8_t *new_bits = FreeImage_GetScanLine(new_dib, rows);			
 		uint8_t *bits = FreeImage_GetScanLine(dib_ptr, rows);
 
-		for (WORD cols = 0; cols < img_width; cols++) {
+		for (uint16_t cols = 0; cols < img_width; cols++) {
 			new_bits[cols] = (uint8_t)inxsearch(bits[FI_RGBA_BLUE], bits[FI_RGBA_GREEN], bits[FI_RGBA_RED]);
 
 			bits += 3;
diff --git a/libs/freeimage/src/FreeImage/PixelAccess.cpp b/libs/freeimage/src/FreeImage/PixelAccess.cpp
index 185763c3ba..1a6b316980 100644
--- a/libs/freeimage/src/FreeImage/PixelAccess.cpp
+++ b/libs/freeimage/src/FreeImage/PixelAccess.cpp
@@ -77,7 +77,7 @@ FreeImage_GetPixelColor(FIBITMAP *dib, unsigned x, unsigned y, RGBQUAD *value) {
 			case 16:
 			{
 				bits += 2*x;
-				WORD *pixel = (WORD *)bits;
+				uint16_t *pixel = (uint16_t *)bits;
 				if((FreeImage_GetRedMask(dib) == FI16_565_RED_MASK) && (FreeImage_GetGreenMask(dib) == FI16_565_GREEN_MASK) && (FreeImage_GetBlueMask(dib) == FI16_565_BLUE_MASK)) {
 					value->rgbBlue		= (uint8_t)((((*pixel & FI16_565_BLUE_MASK) >> FI16_565_BLUE_SHIFT) * 0xFF) / 0x1F);
 					value->rgbGreen		= (uint8_t)((((*pixel & FI16_565_GREEN_MASK) >> FI16_565_GREEN_SHIFT) * 0xFF) / 0x3F);
@@ -159,7 +159,7 @@ FreeImage_SetPixelColor(FIBITMAP *dib, unsigned x, unsigned y, RGBQUAD *value) {
 			case 16:
 			{
 				bits += 2*x;
-				WORD *pixel = (WORD *)bits;
+				uint16_t *pixel = (uint16_t *)bits;
 				if((FreeImage_GetRedMask(dib) == FI16_565_RED_MASK) && (FreeImage_GetGreenMask(dib) == FI16_565_GREEN_MASK) && (FreeImage_GetBlueMask(dib) == FI16_565_BLUE_MASK)) {
 					*pixel = ((value->rgbBlue >> 3) << FI16_565_BLUE_SHIFT) |
 						((value->rgbGreen >> 2) << FI16_565_GREEN_SHIFT) |
diff --git a/libs/freeimage/src/FreeImage/PluginBMP.cpp b/libs/freeimage/src/FreeImage/PluginBMP.cpp
index a27760a1ea..8734c51b9b 100644
--- a/libs/freeimage/src/FreeImage/PluginBMP.cpp
+++ b/libs/freeimage/src/FreeImage/PluginBMP.cpp
@@ -39,10 +39,10 @@ static const uint8_t BI_ALPHABITFIELDS = 6;	// compression: Bit field (this valu
 
 typedef struct tagBITMAPINFOOS2_1X_HEADER {
   DWORD  biSize;
-  WORD   biWidth;
-  WORD   biHeight; 
-  WORD   biPlanes; 
-  WORD   biBitCount;
+  uint16_t   biWidth;
+  uint16_t   biHeight; 
+  uint16_t   biPlanes; 
+  uint16_t   biBitCount;
 } BITMAPINFOOS2_1X_HEADER, *PBITMAPINFOOS2_1X_HEADER; 
 
 // ==========================================================
@@ -136,7 +136,7 @@ LoadPixelData(FreeImageIO *io, fi_handle handle, FIBITMAP *dib, int height, unsi
 #ifdef FREEIMAGE_BIGENDIAN
 	if (bit_count == 16) {
 		for(unsigned y = 0; y < FreeImage_GetHeight(dib); y++) {
-			WORD *pixel = (WORD *)FreeImage_GetScanLine(dib, y);
+			uint16_t *pixel = (uint16_t *)FreeImage_GetScanLine(dib, y);
 			for(unsigned x = 0; x < FreeImage_GetWidth(dib); x++) {
 				SwapShort(pixel);
 				pixel++;
@@ -1383,15 +1383,15 @@ Save(FreeImageIO *io, FIBITMAP *dib, fi_handle handle, int page, int flags, void
 			free(buffer);
 #ifdef FREEIMAGE_BIGENDIAN
 		} else if (bpp == 16) {
-			int padding = dst_pitch - dst_width * sizeof(WORD);
-			WORD pad = 0;
-			WORD pixel;
+			int padding = dst_pitch - dst_width * sizeof(uint16_t);
+			uint16_t pad = 0;
+			uint16_t pixel;
 			for(unsigned y = 0; y < dst_height; y++) {
 				uint8_t *line = FreeImage_GetScanLine(dib, y);
 				for(unsigned x = 0; x < dst_width; x++) {
-					pixel = ((WORD *)line)[x];
+					pixel = ((uint16_t *)line)[x];
 					SwapShort(&pixel);
-					if (io->write_proc(&pixel, sizeof(WORD), 1, handle) != 1) {
+					if (io->write_proc(&pixel, sizeof(uint16_t), 1, handle) != 1) {
 						return FALSE;
 					}
 				}
diff --git a/libs/freeimage/src/FreeImage/PluginGIF.cpp b/libs/freeimage/src/FreeImage/PluginGIF.cpp
index b1c823bdc8..3ec9a1b280 100644
--- a/libs/freeimage/src/FreeImage/PluginGIF.cpp
+++ b/libs/freeimage/src/FreeImage/PluginGIF.cpp
@@ -64,10 +64,10 @@ struct GIFinfo {
 
 struct PageInfo {
 	PageInfo(int d, int l, int t, int w, int h) { 
-		disposal_method = d; left = (WORD)l; top = (WORD)t; width = (WORD)w; height = (WORD)h; 
+		disposal_method = d; left = (uint16_t)l; top = (uint16_t)t; width = (uint16_t)w; height = (uint16_t)h; 
 	}
 	int disposal_method;
-	WORD left, top, width, height;
+	uint16_t left, top, width, height;
 };
 
 //GIF defines a max of 12 bits per code
@@ -144,7 +144,7 @@ static int g_GifInterlaceIncrement[GIF_INTERLACE_PASSES] = {8, 8, 4, 2};
 // ==========================================================
 
 static BOOL 
-FreeImage_SetMetadataEx(FREE_IMAGE_MDMODEL model, FIBITMAP *dib, const char *key, WORD id, FREE_IMAGE_MDTYPE type, DWORD count, DWORD length, const void *value)
+FreeImage_SetMetadataEx(FREE_IMAGE_MDMODEL model, FIBITMAP *dib, const char *key, uint16_t id, FREE_IMAGE_MDTYPE type, DWORD count, DWORD length, const void *value)
 {
 	BOOL bResult = FALSE;
 	FITAG *tag = FreeImage_CreateTag();
@@ -672,15 +672,15 @@ Load(FreeImageIO *io, fi_handle handle, int page, int flags, void *data) {
 	try {
 		bool have_transparent = false, no_local_palette = false, interlaced = false;
 		int disposal_method = GIF_DISPOSAL_LEAVE, delay_time = 0, transparent_color = 0;
-		WORD left, top, width, height;
+		uint16_t left, top, width, height;
 		uint8_t packed, b;
-		WORD w;
+		uint16_t w;
 
 		//playback pages to generate what the user would see for this frame
 		if( (flags & GIF_PLAYBACK) == GIF_PLAYBACK ) {
 			//Logical Screen Descriptor
 			io->seek_proc(handle, 6, SEEK_SET);
-			WORD logicalwidth, logicalheight;
+			uint16_t logicalwidth, logicalheight;
 			io->read_proc(&logicalwidth, 2, 1, handle);
 			io->read_proc(&logicalheight, 2, 1, handle);
 #ifdef FREEIMAGE_BIGENDIAN
@@ -958,7 +958,7 @@ Load(FreeImageIO *io, fi_handle handle, int page, int flags, void *data) {
 
 			//Logical Screen Descriptor
 			io->seek_proc(handle, 6, SEEK_SET);
-			WORD logicalwidth, logicalheight;
+			uint16_t logicalwidth, logicalheight;
 			io->read_proc(&logicalwidth, 2, 1, handle);
 			io->read_proc(&logicalheight, 2, 1, handle);
 #ifdef FREEIMAGE_BIGENDIAN
@@ -1083,7 +1083,7 @@ Save(FreeImageIO *io, FIBITMAP *dib, fi_handle handle, int page, int flags, void
 
 	try {
 		uint8_t packed, b;
-		WORD w;
+		uint16_t w;
 		FITAG *tag;
 
 		int bpp = FreeImage_GetBPP(dib);
@@ -1093,13 +1093,13 @@ Save(FreeImageIO *io, FIBITMAP *dib, fi_handle handle, int page, int flags, void
 
 		bool have_transparent = false, no_local_palette = false, interlaced = false;
 		int disposal_method = GIF_DISPOSAL_BACKGROUND, delay_time = 100, transparent_color = 0;
-		WORD left = 0, top = 0, width = (WORD)FreeImage_GetWidth(dib), height = (WORD)FreeImage_GetHeight(dib);
-		WORD output_height = height;
+		uint16_t left = 0, top = 0, width = (uint16_t)FreeImage_GetWidth(dib), height = (uint16_t)FreeImage_GetHeight(dib);
+		uint16_t output_height = height;
 		if( FreeImage_GetMetadataEx(FIMD_ANIMATION, dib, "FrameLeft", FIDT_SHORT, &tag) ) {
-			left = *(WORD *)FreeImage_GetTagValue(tag);
+			left = *(uint16_t *)FreeImage_GetTagValue(tag);
 		}
 		if( FreeImage_GetMetadataEx(FIMD_ANIMATION, dib, "FrameTop", FIDT_SHORT, &tag) ) {
-			top = *(WORD *)FreeImage_GetTagValue(tag);
+			top = *(uint16_t *)FreeImage_GetTagValue(tag);
 		}
 		if( FreeImage_GetMetadataEx(FIMD_ANIMATION, dib, "NoLocalPalette", FIDT_BYTE, &tag) ) {
 			no_local_palette = *(uint8_t *)FreeImage_GetTagValue(tag) ? true : false;
@@ -1124,16 +1124,16 @@ Save(FreeImageIO *io, FIBITMAP *dib, fi_handle handle, int page, int flags, void
 
 		if( page == 0 ) {
 			//gather some info
-			WORD logicalwidth = width; // width has already been swapped...
+			uint16_t logicalwidth = width; // width has already been swapped...
 			if( FreeImage_GetMetadataEx(FIMD_ANIMATION, dib, "LogicalWidth", FIDT_SHORT, &tag) ) {
-				logicalwidth = *(WORD *)FreeImage_GetTagValue(tag);
+				logicalwidth = *(uint16_t *)FreeImage_GetTagValue(tag);
 #ifdef FREEIMAGE_BIGENDIAN
 				SwapShort(&logicalwidth);
 #endif
 			}
-			WORD logicalheight = height; // height has already been swapped...
+			uint16_t logicalheight = height; // height has already been swapped...
 			if( FreeImage_GetMetadataEx(FIMD_ANIMATION, dib, "LogicalHeight", FIDT_SHORT, &tag) ) {
-				logicalheight = *(WORD *)FreeImage_GetTagValue(tag);
+				logicalheight = *(uint16_t *)FreeImage_GetTagValue(tag);
 #ifdef FREEIMAGE_BIGENDIAN
 				SwapShort(&logicalheight);
 #endif
@@ -1219,7 +1219,7 @@ Save(FreeImageIO *io, FIBITMAP *dib, fi_handle handle, int page, int flags, void
 				//the Netscape extension is really "repeats" not "loops"
 				if( loop > 1 ) loop--;
 				if( loop > 0xFFFF ) loop = 0xFFFF;
-				w = (WORD)loop;
+				w = (uint16_t)loop;
 #ifdef FREEIMAGE_BIGENDIAN
 				SwapShort(&w);
 #endif
@@ -1275,7 +1275,7 @@ Save(FreeImageIO *io, FIBITMAP *dib, fi_handle handle, int page, int flags, void
 		//IE5/IE6 have a minimum and default of 100ms
 		//Mozilla/Firefox/Netscape 6+/Opera have a minimum of 20ms and a default of 100ms if <20ms is specified or the GCE is absent
 		//Netscape 4 has a minimum of 10ms if 0ms is specified, but will use 0ms if the GCE is absent
-		w = (WORD)(delay_time / 10); //convert ms to cs
+		w = (uint16_t)(delay_time / 10); //convert ms to cs
 #ifdef FREEIMAGE_BIGENDIAN
 		SwapShort(&w);
 #endif
@@ -1344,7 +1344,7 @@ Save(FreeImageIO *io, FIBITMAP *dib, fi_handle handle, int page, int flags, void
 		}
 		size = (int)(bufptr - buf);
 		uint8_t last[4];
-		w = (WORD)stringtable->CompressEnd(last);
+		w = (uint16_t)stringtable->CompressEnd(last);
 		if( size + w >= sizeof(buf) ) {
 			//one last full size sub-block
 			io->write_proc(&b, 1, 1, handle);
diff --git a/libs/freeimage/src/FreeImage/PluginICO.cpp b/libs/freeimage/src/FreeImage/PluginICO.cpp
index d34c49fde4..96db02ad3c 100644
--- a/libs/freeimage/src/FreeImage/PluginICO.cpp
+++ b/libs/freeimage/src/FreeImage/PluginICO.cpp
@@ -36,9 +36,9 @@
 // in an ICO file.
 
 typedef struct tagICONHEADER {
-	WORD			idReserved;   // reserved
-	WORD			idType;       // resource type (1 for icons)
-	WORD			idCount;      // how many images?
+	uint16_t			idReserved;   // reserved
+	uint16_t			idType;       // resource type (1 for icons)
+	uint16_t			idCount;      // how many images?
 } ICONHEADER;
 
 typedef struct tagICONDIRECTORYENTRY {
@@ -46,8 +46,8 @@ typedef struct tagICONDIRECTORYENTRY {
 	uint8_t	bHeight;              // height of the image (times 2)
 	uint8_t	bColorCount;          // number of colors in image (0 if >=8bpp)
 	uint8_t	bReserved;            // reserved
-	WORD	wPlanes;              // color Planes
-	WORD	wBitCount;            // bits per pixel
+	uint16_t	wPlanes;              // color Planes
+	uint16_t	wBitCount;            // bits per pixel
 	DWORD	dwBytesInRes;         // how many bytes in this resource?
 	DWORD	dwImageOffset;        // where in the file is this image
 } ICONDIRENTRY;
@@ -333,7 +333,7 @@ LoadStandardIcon(FreeImageIO *io, fi_handle handle, int flags, BOOL header_only)
 #ifdef FREEIMAGE_BIGENDIAN
 	if (bit_count == 16) {
 		for(int y = 0; y < height; y++) {
-			WORD *pixel = (WORD *)FreeImage_GetScanLine(dib, y);
+			uint16_t *pixel = (uint16_t *)FreeImage_GetScanLine(dib, y);
 			for(int x = 0; x < width; x++) {
 				SwapShort(pixel);
 				pixel++;
@@ -496,13 +496,13 @@ SaveStandardIcon(FreeImageIO *io, FIBITMAP *dib, fi_handle handle) {
 	// XOR mask
 #ifdef FREEIMAGE_BIGENDIAN
 	if (bit_count == 16) {
-		WORD pixel;
+		uint16_t pixel;
 		for(unsigned y = 0; y < FreeImage_GetHeight(dib); y++) {
 			uint8_t *line = FreeImage_GetScanLine(dib, y);
 			for(unsigned x = 0; x < FreeImage_GetWidth(dib); x++) {
-				pixel = ((WORD *)line)[x];
+				pixel = ((uint16_t *)line)[x];
 				SwapShort(&pixel);
-				if (io->write_proc(&pixel, sizeof(WORD), 1, handle) != 1)
+				if (io->write_proc(&pixel, sizeof(uint16_t), 1, handle) != 1)
 					return FALSE;
 			}
 		}
diff --git a/libs/freeimage/src/FreeImage/PluginJPEG.cpp b/libs/freeimage/src/FreeImage/PluginJPEG.cpp
index dc76574723..23c13deef2 100644
--- a/libs/freeimage/src/FreeImage/PluginJPEG.cpp
+++ b/libs/freeimage/src/FreeImage/PluginJPEG.cpp
@@ -1308,7 +1308,7 @@ Load(FreeImageIO *io, fi_handle handle, int page, int flags, void *data) {
 					jpeg_read_scanlines(&cinfo, buffer, 1);
 
 					for(unsigned x = 0; x < cinfo.output_width; x++) {
-						WORD K = (WORD)src[3];
+						uint16_t K = (uint16_t)src[3];
 						dst[FI_RGBA_RED]   = (uint8_t)((K * src[0]) / 255);	// C -> R
 						dst[FI_RGBA_GREEN] = (uint8_t)((K * src[1]) / 255);	// M -> G
 						dst[FI_RGBA_BLUE]  = (uint8_t)((K * src[2]) / 255);	// Y -> B
@@ -1408,7 +1408,7 @@ Save(FreeImageIO *io, FIBITMAP *dib, fi_handle handle, int page, int flags, void
 			const char *sError = "only 24-bit RGB, 8-bit greyscale/palette or 32-bit CMYK bitmaps can be saved as JPEG";
 
 			FREE_IMAGE_COLOR_TYPE color_type = FreeImage_GetColorType(dib);
-			WORD bpp = (WORD)FreeImage_GetBPP(dib);
+			uint16_t bpp = (uint16_t)FreeImage_GetBPP(dib);
 
 			if ((bpp != 24) && (bpp != 8) && !(bpp == 32 && (color_type == FIC_CMYK))) {
 				throw sError;
diff --git a/libs/freeimage/src/FreeImage/WuQuantizer.cpp b/libs/freeimage/src/FreeImage/WuQuantizer.cpp
index c84f1c593e..bbf3fd0a7c 100644
--- a/libs/freeimage/src/FreeImage/WuQuantizer.cpp
+++ b/libs/freeimage/src/FreeImage/WuQuantizer.cpp
@@ -62,7 +62,7 @@ WuQuantizer::WuQuantizer(FIBITMAP *dib) {
 	mb = (LONG*)malloc(SIZE_3D * sizeof(LONG));
 
 	// Allocate Qadd
-	Qadd = (WORD *)malloc(sizeof(WORD) * width * height);
+	Qadd = (uint16_t *)malloc(sizeof(uint16_t) * width * height);
 
 	if(!gm2 || !wt || !mr || !mg || !mb || !Qadd) {
 		if(gm2)	free(gm2);
@@ -78,7 +78,7 @@ WuQuantizer::WuQuantizer(FIBITMAP *dib) {
 	memset(mr, 0, SIZE_3D * sizeof(LONG));
 	memset(mg, 0, SIZE_3D * sizeof(LONG));
 	memset(mb, 0, SIZE_3D * sizeof(LONG));
-	memset(Qadd, 0, sizeof(WORD) * width * height);
+	memset(Qadd, 0, sizeof(uint16_t) * width * height);
 }
 
 WuQuantizer::~WuQuantizer() {
@@ -115,7 +115,7 @@ WuQuantizer::Hist3D(LONG *vwt, LONG *vmr, LONG *vmg, LONG *vmb, float *m2, int R
 				ing = (bits[FI_RGBA_GREEN] >> 3) + 1;
 				inb = (bits[FI_RGBA_BLUE] >> 3) + 1;
 				ind = INDEX(inr, ing, inb);
-				Qadd[y*width + x] = (WORD)ind;
+				Qadd[y*width + x] = (uint16_t)ind;
 				// [inr][ing][inb]
 				vwt[ind]++;
 				vmr[ind] += bits[FI_RGBA_RED];
@@ -134,7 +134,7 @@ WuQuantizer::Hist3D(LONG *vwt, LONG *vmr, LONG *vmg, LONG *vmb, float *m2, int R
 				ing = (bits[FI_RGBA_GREEN] >> 3) + 1;
 				inb = (bits[FI_RGBA_BLUE] >> 3) + 1;
 				ind = INDEX(inr, ing, inb);
-				Qadd[y*width + x] = (WORD)ind;
+				Qadd[y*width + x] = (uint16_t)ind;
 				// [inr][ing][inb]
 				vwt[ind]++;
 				vmr[ind] += bits[FI_RGBA_RED];