summaryrefslogtreecommitdiff
path: root/plugins/AdvaImg/src/FreeImage/Conversion8.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/AdvaImg/src/FreeImage/Conversion8.cpp')
-rw-r--r--plugins/AdvaImg/src/FreeImage/Conversion8.cpp212
1 files changed, 95 insertions, 117 deletions
diff --git a/plugins/AdvaImg/src/FreeImage/Conversion8.cpp b/plugins/AdvaImg/src/FreeImage/Conversion8.cpp
index 867cf756ed..1c331a6552 100644
--- a/plugins/AdvaImg/src/FreeImage/Conversion8.cpp
+++ b/plugins/AdvaImg/src/FreeImage/Conversion8.cpp
@@ -6,6 +6,7 @@
// - Hervé Drolon (drolon@infonie.fr)
// - Jani Kajala (janik@remedy.fi)
// - Karl-Heinz Bussian (khbussian@moss.de)
+// - Carsten Klein (cklein05@users.sourceforge.net)
//
// This file is part of FreeImage 3
//
@@ -31,36 +32,32 @@
void DLL_CALLCONV
FreeImage_ConvertLine1To8(BYTE *target, BYTE *source, int width_in_pixels) {
- for (int cols = 0; cols < width_in_pixels; cols++)
+ for (unsigned cols = 0; cols < (unsigned)width_in_pixels; cols++)
target[cols] = (source[cols >> 3] & (0x80 >> (cols & 0x07))) != 0 ? 255 : 0;
}
void DLL_CALLCONV
FreeImage_ConvertLine4To8(BYTE *target, BYTE *source, int width_in_pixels) {
- int count_new = 0;
- int count_org = 0;
+ unsigned count_new = 0;
+ unsigned count_org = 0;
BOOL hinibble = TRUE;
- while (count_new < width_in_pixels) {
+ while (count_new < (unsigned)width_in_pixels) {
if (hinibble) {
- target[count_new] = (source[count_org] & 0xF0) >> 4;
+ target[count_new] = (source[count_org] >> 4);
} else {
target[count_new] = (source[count_org] & 0x0F);
-
count_org++;
}
-
hinibble = !hinibble;
-
count_new++;
}
}
void DLL_CALLCONV
FreeImage_ConvertLine16To8_555(BYTE *target, BYTE *source, int width_in_pixels) {
- WORD *bits = (WORD *)source;
-
- for (int cols = 0; cols < width_in_pixels; cols++) {
+ const WORD *const bits = (WORD *)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,
(((bits[cols] & FI16_555_BLUE_MASK) >> FI16_555_BLUE_SHIFT) * 0xFF) / 0x1F);
@@ -69,28 +66,26 @@ FreeImage_ConvertLine16To8_555(BYTE *target, BYTE *source, int width_in_pixels)
void DLL_CALLCONV
FreeImage_ConvertLine16To8_565(BYTE *target, BYTE *source, int width_in_pixels) {
- WORD *bits = (WORD *)source;
-
- for (int cols = 0; cols < width_in_pixels; cols++)
+ const WORD *const bits = (WORD *)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,
- (((bits[cols] & FI16_565_BLUE_MASK) >> FI16_565_BLUE_SHIFT) * 0xFF) / 0x1F);
+ (((bits[cols] & FI16_565_BLUE_MASK) >> FI16_565_BLUE_SHIFT) * 0xFF) / 0x1F);
+ }
}
void DLL_CALLCONV
FreeImage_ConvertLine24To8(BYTE *target, BYTE *source, int width_in_pixels) {
- for (int cols = 0; cols < width_in_pixels; cols++) {
+ for (unsigned cols = 0; cols < (unsigned)width_in_pixels; cols++) {
target[cols] = GREY(source[FI_RGBA_RED], source[FI_RGBA_GREEN], source[FI_RGBA_BLUE]);
-
source += 3;
}
}
void DLL_CALLCONV
FreeImage_ConvertLine32To8(BYTE *target, BYTE *source, int width_in_pixels) {
- for (int cols = 0; cols < width_in_pixels; cols++) {
+ for (unsigned cols = 0; cols < (unsigned)width_in_pixels; cols++) {
target[cols] = GREY(source[FI_RGBA_RED], source[FI_RGBA_GREEN], source[FI_RGBA_BLUE]);
-
source += 4;
}
}
@@ -101,64 +96,54 @@ FreeImage_ConvertLine32To8(BYTE *target, BYTE *source, int width_in_pixels) {
FIBITMAP * DLL_CALLCONV
FreeImage_ConvertTo8Bits(FIBITMAP *dib) {
- if (!FreeImage_HasPixels(dib)) return NULL;
-
- const int bpp = FreeImage_GetBPP(dib);
+ if (!FreeImage_HasPixels(dib)) {
+ return NULL;
+ }
const FREE_IMAGE_TYPE image_type = FreeImage_GetImageType(dib);
- if ((image_type != FIT_BITMAP) && (image_type != FIT_UINT16)) {
+ if (image_type != FIT_BITMAP && image_type != FIT_UINT16) {
return NULL;
}
- if(bpp != 8) {
- const int width = FreeImage_GetWidth(dib);
- const int height = FreeImage_GetHeight(dib);
- FIBITMAP *new_dib = FreeImage_Allocate(width, height, 8);
+ const unsigned bpp = FreeImage_GetBPP(dib);
+
+ if (bpp != 8) {
+
+ const unsigned width = FreeImage_GetWidth(dib);
+ const unsigned height = FreeImage_GetHeight(dib);
- if(new_dib == NULL) {
+ // Allocate a destination image
+ FIBITMAP *new_dib = FreeImage_Allocate(width, height, 8);
+ if (new_dib == NULL) {
return NULL;
}
- // copy metadata from src to dst
+ // Copy metadata from src to dst
FreeImage_CloneMetadata(new_dib, dib);
- // Build a greyscale palette (*always* needed for image processing)
-
+ // Palette of destination image has already been initialized
RGBQUAD *new_pal = FreeImage_GetPalette(new_dib);
- for(int i = 0; i < 256; i++) {
- new_pal[i].rgbRed = (BYTE)i;
- new_pal[i].rgbGreen = (BYTE)i;
- new_pal[i].rgbBlue = (BYTE)i;
- }
+ const FREE_IMAGE_COLOR_TYPE color_type = FreeImage_GetColorType(dib);
- if(image_type == FIT_BITMAP) {
+ if (image_type == FIT_BITMAP) {
switch(bpp) {
case 1:
{
- if(FreeImage_GetColorType(dib) == FIC_PALETTE) {
-
+ if (color_type == FIC_PALETTE) {
// Copy the palette
-
RGBQUAD *old_pal = FreeImage_GetPalette(dib);
- memcpy(&new_pal[0], &old_pal[0], sizeof(RGBQUAD));
- memcpy(&new_pal[255], &old_pal[1], sizeof(RGBQUAD));
+ new_pal[0] = old_pal[0];
+ new_pal[255] = old_pal[1];
+ } else if (color_type == FIC_MINISWHITE) {
+ // Create a reverse grayscale palette
+ CREATE_GREYSCALE_PALETTE_REVERSE(new_pal, 256);
}
- else if(FreeImage_GetColorType(dib) == FIC_MINISWHITE) {
-
- // Reverse the grayscale palette
-
- for(int i = 0; i < 256; i++) {
- new_pal[i].rgbRed = new_pal[i].rgbGreen = new_pal[i].rgbBlue = (BYTE)(255 - i);
- }
- }
-
// Expand and copy the bitmap data
-
- for (int rows = 0; rows < height; rows++) {
+ for (unsigned rows = 0; rows < height; rows++) {
FreeImage_ConvertLine1To8(FreeImage_GetScanLine(new_dib, rows), FreeImage_GetScanLine(dib, rows), width);
}
return new_dib;
@@ -166,22 +151,13 @@ FreeImage_ConvertTo8Bits(FIBITMAP *dib) {
case 4 :
{
- if(FreeImage_GetColorType(dib) == FIC_PALETTE) {
-
+ if (color_type == FIC_PALETTE) {
// Copy the palette
-
- RGBQUAD *old_pal = FreeImage_GetPalette(dib);
-
- for (int i = 0; i < 16; i++) {
- new_pal[i].rgbRed = old_pal[i].rgbRed;
- new_pal[i].rgbGreen = old_pal[i].rgbGreen;
- new_pal[i].rgbBlue = old_pal[i].rgbBlue;
- }
+ memcpy(new_pal, FreeImage_GetPalette(dib), 16 * sizeof(RGBQUAD));
}
// Expand and copy the bitmap data
-
- for (int rows = 0; rows < height; rows++) {
+ for (unsigned rows = 0; rows < height; rows++) {
FreeImage_ConvertLine4To8(FreeImage_GetScanLine(new_dib, rows), FreeImage_GetScanLine(dib, rows), width);
}
return new_dib;
@@ -190,23 +166,22 @@ FreeImage_ConvertTo8Bits(FIBITMAP *dib) {
case 16 :
{
// Expand and copy the bitmap data
-
- for (int rows = 0; rows < height; rows++) {
- if ((FreeImage_GetRedMask(dib) == FI16_565_RED_MASK) && (FreeImage_GetGreenMask(dib) == FI16_565_GREEN_MASK) && (FreeImage_GetBlueMask(dib) == FI16_565_BLUE_MASK)) {
+ if (IS_FORMAT_RGB565(dib)) {
+ for (unsigned rows = 0; rows < height; rows++) {
FreeImage_ConvertLine16To8_565(FreeImage_GetScanLine(new_dib, rows), FreeImage_GetScanLine(dib, rows), width);
- } else {
+ }
+ } else {
+ for (unsigned rows = 0; rows < height; rows++) {
FreeImage_ConvertLine16To8_555(FreeImage_GetScanLine(new_dib, rows), FreeImage_GetScanLine(dib, rows), width);
}
}
-
return new_dib;
}
case 24 :
{
// Expand and copy the bitmap data
-
- for (int rows = 0; rows < height; rows++) {
+ for (unsigned rows = 0; rows < height; rows++) {
FreeImage_ConvertLine24To8(FreeImage_GetScanLine(new_dib, rows), FreeImage_GetScanLine(dib, rows), width);
}
return new_dib;
@@ -215,32 +190,30 @@ FreeImage_ConvertTo8Bits(FIBITMAP *dib) {
case 32 :
{
// Expand and copy the bitmap data
-
- for (int rows = 0; rows < height; rows++) {
+ for (unsigned rows = 0; rows < height; rows++) {
FreeImage_ConvertLine32To8(FreeImage_GetScanLine(new_dib, rows), FreeImage_GetScanLine(dib, rows), width);
}
return new_dib;
}
}
- } else if(image_type == FIT_UINT16) {
+ } else if (image_type == FIT_UINT16) {
const unsigned src_pitch = FreeImage_GetPitch(dib);
const unsigned dst_pitch = FreeImage_GetPitch(new_dib);
const BYTE *src_bits = FreeImage_GetBits(dib);
BYTE *dst_bits = FreeImage_GetBits(new_dib);
- for (int rows = 0; rows < height; rows++) {
- const WORD *src_pixel = (WORD*)src_bits;
+
+ for (unsigned rows = 0; rows < height; rows++) {
+ const WORD *const src_pixel = (WORD*)src_bits;
BYTE *dst_pixel = (BYTE*)dst_bits;
- for(int cols = 0; cols < width; cols++) {
+ for(unsigned cols = 0; cols < width; cols++) {
dst_pixel[cols] = (BYTE)(src_pixel[cols] >> 8);
}
src_bits += src_pitch;
dst_bits += dst_pitch;
}
-
return new_dib;
-
}
} // bpp != 8
@@ -250,76 +223,81 @@ FreeImage_ConvertTo8Bits(FIBITMAP *dib) {
FIBITMAP * DLL_CALLCONV
FreeImage_ConvertToGreyscale(FIBITMAP *dib) {
- if (!FreeImage_HasPixels(dib)) return NULL;
+ if (!FreeImage_HasPixels(dib)) {
+ return NULL;
+ }
const FREE_IMAGE_COLOR_TYPE color_type = FreeImage_GetColorType(dib);
- const int bpp = FreeImage_GetBPP(dib);
- if ((color_type == FIC_PALETTE) || (color_type == FIC_MINISWHITE)) {
- const int width = FreeImage_GetWidth(dib);
- const int height = FreeImage_GetHeight(dib);
- FIBITMAP *new_dib = FreeImage_Allocate(width, height, 8);
+ if (color_type == FIC_PALETTE || color_type == FIC_MINISWHITE) {
+
+ const unsigned bpp = FreeImage_GetBPP(dib);
+ const unsigned width = FreeImage_GetWidth(dib);
+ const unsigned height = FreeImage_GetHeight(dib);
- if(new_dib == NULL) {
+ FIBITMAP *new_dib = FreeImage_Allocate(width, height, 8);
+ if (new_dib == NULL) {
return NULL;
}
- // copy metadata from src to dst
+ // Copy metadata from src to dst
FreeImage_CloneMetadata(new_dib, dib);
- // Build a greyscale palette
-
- RGBQUAD *new_pal = FreeImage_GetPalette(new_dib);
-
- for(int i = 0; i < 256; i++) {
- new_pal[i].rgbRed = (BYTE)i;
- new_pal[i].rgbGreen = (BYTE)i;
- new_pal[i].rgbBlue = (BYTE)i;
+ // Create a greyscale palette
+ BYTE grey_pal[256];
+ const RGBQUAD *pal = FreeImage_GetPalette(dib);
+ const unsigned size = CalculateUsedPaletteEntries(bpp);
+ for (unsigned i = 0; i < size; i++) {
+ grey_pal[i] = GREY(pal->rgbRed, pal->rgbGreen, pal->rgbBlue);
+ pal++;
}
- // allocate a 24-bit buffer
-
- BYTE *buffer = (BYTE*)malloc( CalculatePitch(CalculateLine(width, 24)) * sizeof(BYTE));
- if(NULL == buffer) {
- FreeImage_Unload(new_dib);
- return NULL;
- }
+ const BYTE *src_bits = FreeImage_GetBits(dib);
+ BYTE *dst_bits = FreeImage_GetBits(new_dib);
- // Convert the palette to 24-bit, then to 8-bit
+ const unsigned src_pitch = FreeImage_GetPitch(dib);
+ const unsigned dst_pitch = FreeImage_GetPitch(new_dib);
switch(bpp) {
case 1:
{
- for (int rows = 0; rows < height; rows++) {
- FreeImage_ConvertLine1To24(buffer, FreeImage_GetScanLine(dib, rows), width, FreeImage_GetPalette(dib));
- FreeImage_ConvertLine24To8(FreeImage_GetScanLine(new_dib, rows), buffer, width);
+ for (unsigned y = 0; y < height; y++) {
+ for (unsigned x = 0; x < width; x++) {
+ const unsigned pixel = (src_bits[x >> 3] & (0x80 >> (x & 0x07))) != 0;
+ dst_bits[x] = grey_pal[pixel];
+ }
+ src_bits += src_pitch;
+ dst_bits += dst_pitch;
}
}
break;
case 4:
{
- for (int rows = 0; rows < height; rows++) {
- FreeImage_ConvertLine4To24(buffer, FreeImage_GetScanLine(dib, rows), width, FreeImage_GetPalette(dib));
- FreeImage_ConvertLine24To8(FreeImage_GetScanLine(new_dib, rows), buffer, width);
+ for (unsigned y = 0; y < height; y++) {
+ for (unsigned x = 0; x < width; x++) {
+ const unsigned pixel = x & 0x01 ? src_bits[x >> 1] & 0x0F : src_bits[x >> 1] >> 4;
+ dst_bits[x] = grey_pal[pixel];
+ }
+ src_bits += src_pitch;
+ dst_bits += dst_pitch;
}
}
break;
case 8:
{
- for (int rows = 0; rows < height; rows++) {
- FreeImage_ConvertLine8To24(buffer, FreeImage_GetScanLine(dib, rows), width, FreeImage_GetPalette(dib));
- FreeImage_ConvertLine24To8(FreeImage_GetScanLine(new_dib, rows), buffer, width);
+ for (unsigned y = 0; y < height; y++) {
+ for (unsigned x = 0; x < width; x++) {
+ dst_bits[x] = grey_pal[src_bits[x]];
+ }
+ src_bits += src_pitch;
+ dst_bits += dst_pitch;
}
}
break;
-
}
- free(buffer);
-
return new_dib;
-
}
// Convert the bitmap to 8-bit greyscale
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-19 06:43:20 +0000