summaryrefslogtreecommitdiff
path: root/libs/freeimage/src/FreeImage/ConversionRGBAF.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'libs/freeimage/src/FreeImage/ConversionRGBAF.cpp')
-rw-r--r--libs/freeimage/src/FreeImage/ConversionRGBAF.cpp26
1 files changed, 13 insertions, 13 deletions
diff --git a/libs/freeimage/src/FreeImage/ConversionRGBAF.cpp b/libs/freeimage/src/FreeImage/ConversionRGBAF.cpp
index f2bcaa7072..99ece4604d 100644
--- a/libs/freeimage/src/FreeImage/ConversionRGBAF.cpp
+++ b/libs/freeimage/src/FreeImage/ConversionRGBAF.cpp
@@ -104,11 +104,11 @@ FreeImage_ConvertToRGBAF(FIBITMAP *dib) {
// calculate the number of bytes per pixel (4 for 32-bit)
const unsigned bytespp = FreeImage_GetLine(src) / FreeImage_GetWidth(src);
- const BYTE *src_bits = (BYTE*)FreeImage_GetBits(src);
- BYTE *dst_bits = (BYTE*)FreeImage_GetBits(dst);
+ const uint8_t *src_bits = (uint8_t*)FreeImage_GetBits(src);
+ uint8_t *dst_bits = (uint8_t*)FreeImage_GetBits(dst);
for(unsigned y = 0; y < height; y++) {
- const BYTE *src_pixel = (BYTE*)src_bits;
+ const uint8_t *src_pixel = (uint8_t*)src_bits;
FIRGBAF *dst_pixel = (FIRGBAF*)dst_bits;
for(unsigned x = 0; x < width; x++) {
// convert and scale to the range [0..1]
@@ -128,8 +128,8 @@ FreeImage_ConvertToRGBAF(FIBITMAP *dib) {
case FIT_UINT16:
{
- const BYTE *src_bits = (BYTE*)FreeImage_GetBits(src);
- BYTE *dst_bits = (BYTE*)FreeImage_GetBits(dst);
+ const uint8_t *src_bits = (uint8_t*)FreeImage_GetBits(src);
+ uint8_t *dst_bits = (uint8_t*)FreeImage_GetBits(dst);
for(unsigned y = 0; y < height; y++) {
const WORD *src_pixel = (WORD*)src_bits;
@@ -151,8 +151,8 @@ FreeImage_ConvertToRGBAF(FIBITMAP *dib) {
case FIT_RGB16:
{
- const BYTE *src_bits = (BYTE*)FreeImage_GetBits(src);
- BYTE *dst_bits = (BYTE*)FreeImage_GetBits(dst);
+ const uint8_t *src_bits = (uint8_t*)FreeImage_GetBits(src);
+ uint8_t *dst_bits = (uint8_t*)FreeImage_GetBits(dst);
for(unsigned y = 0; y < height; y++) {
const FIRGB16 *src_pixel = (FIRGB16*)src_bits;
@@ -173,8 +173,8 @@ FreeImage_ConvertToRGBAF(FIBITMAP *dib) {
case FIT_RGBA16:
{
- const BYTE *src_bits = (BYTE*)FreeImage_GetBits(src);
- BYTE *dst_bits = (BYTE*)FreeImage_GetBits(dst);
+ const uint8_t *src_bits = (uint8_t*)FreeImage_GetBits(src);
+ uint8_t *dst_bits = (uint8_t*)FreeImage_GetBits(dst);
for(unsigned y = 0; y < height; y++) {
const FIRGBA16 *src_pixel = (FIRGBA16*)src_bits;
@@ -195,8 +195,8 @@ FreeImage_ConvertToRGBAF(FIBITMAP *dib) {
case FIT_FLOAT:
{
- const BYTE *src_bits = (BYTE*)FreeImage_GetBits(src);
- BYTE *dst_bits = (BYTE*)FreeImage_GetBits(dst);
+ const uint8_t *src_bits = (uint8_t*)FreeImage_GetBits(src);
+ uint8_t *dst_bits = (uint8_t*)FreeImage_GetBits(dst);
for(unsigned y = 0; y < height; y++) {
const float *src_pixel = (float*)src_bits;
@@ -219,8 +219,8 @@ FreeImage_ConvertToRGBAF(FIBITMAP *dib) {
case FIT_RGBF:
{
- const BYTE *src_bits = (BYTE*)FreeImage_GetBits(src);
- BYTE *dst_bits = (BYTE*)FreeImage_GetBits(dst);
+ const uint8_t *src_bits = (uint8_t*)FreeImage_GetBits(src);
+ uint8_t *dst_bits = (uint8_t*)FreeImage_GetBits(dst);
for(unsigned y = 0; y < height; y++) {
const FIRGBF *src_pixel = (FIRGBF*)src_bits;