pass DitherType as arg

Author: Aikku93

Qualetize.h

@@ -6,6 +6,20 @@
 #include "Tiles.h"
 /**************************************/
 
+//! Dither modes available
+#define DITHER_NONE           ( 0) //! No dither
+#define DITHER_ORDERED(n)     ( n) //! Ordered dithering (Kernel size: (2^n) x (2^n))
+#define DITHER_FLOYDSTEINBERG (-1) //! Floyd-Steinberg (diffusion)
+
+//! Dither settings
+//! NOTE: Ordered dithering gives consistent tiled results, but Floyd-Steinberg can look nicer.
+//!       Recommend dither level of 0.5 for ordered, and 1.0 for Floyd-Steinberg.
+//! NOTE: DITHER_NO_ALPHA disables dithering on the alpha channel.
+#define DITHER_LEVEL 0.5f
+#define DITHER_NO_ALPHA
+
+/**************************************/
+
 //! Handle conversion of image, return RMS error
 //! NOTE:
 //!  * With ReplaceImage != 0, {Image->ColMap,Image->PxIdx} (or
@@ -18,6 +32,8 @@ struct BGRAf_t Qualetize(
 	int MaxTilePals,
 	int MaxPalSize,
 	int PalUnused,
+	const struct BGRA8_t *BitRange,
+	int DitherType,
 	int ReplaceImage
 );
 

tilequant.c

@@ -12,6 +12,10 @@
 #define TILE_H 8
 #define PALUNUSED 1 //! These will be filled with {0,0,0,0} but still be used for matching
 #define BITRANGE (const struct BGRA8_t){0x1F,0x1F,0x1F,0x01} //! None of these may be 0
+
+//! Default dither mode
+#define DITHER_TYPE DITHER_ORDERED(3)
+
 /**************************************/
 
 //! When not zero, the PSNR for each channel will be displayed
@@ -47,7 +51,7 @@ int main(int argc, const char *argv[]) {
 
 	//! Perform processing
 	//! NOTE: PxData and Palette will be assigned to image; do NOT destroy
-	struct TilesData_t *TilesData = TilesData_FromBitmap(&Image, TILE_W, TILE_H, &BITRANGE);
+	struct TilesData_t *TilesData = TilesData_FromBitmap(&Image, TILE_W, TILE_H);
 	       uint8_t     *PxData    = malloc(Image.Width * Image.Height * sizeof(uint8_t));
 	struct BGRAf_t     *Palette   = calloc(BMP_PALETTE_COLOURS, sizeof(struct BGRAf_t));
 	if(!TilesData || !PxData || !Palette) {
@@ -58,7 +62,9 @@ int main(int argc, const char *argv[]) {
 		BmpCtx_Destroy(&Image);
 		return -1;
 	}
-	struct BGRAf_t RMSE = Qualetize(&Image, TilesData, PxData, Palette, MaxTilePals, MaxPalSize, PALUNUSED, 1);
+	struct BGRAf_t RMSE = Qualetize(
+		&Image, TilesData, PxData, Palette, MaxTilePals, MaxPalSize, PALUNUSED, &BITRANGE, DITHER_TYPE, 1
+	);
 	free(TilesData);
 
 	//! Output PSNR

tilequantDLL.c

@@ -21,6 +21,7 @@
 //!    NOTE: DstPal must have enough space to accomodate:
 //!     (struct BGRAf_t)[nPalettes * nColoursPerPalette]
 //!   TilePalIdx = NULL or int32_t[(Width*Height) / (TileW*TileH)]
+//!   DitherMode = Dither mode to use: 0 = DITHER_NONE, -1 = DITHER_FLOYDSTEINBERG, n = DITHER_ORDERED(n)
 //! OutputPaletteIs24bitRGB outputs RGB (byte order: {RR, GG, BB})
 //! colours without an alpha channel; the default is to output to
 //! BGRA (byte order: {BB, GG, RR, AA}).
@@ -41,7 +42,8 @@ DECLSPEC int QualetizeFromRawImage(
 	int      TileW,
 	int      TileH,
 	int32_t *TilePalIdx,
-	const uint8_t BitRange[4]
+	const uint8_t BitRange[4],
+	int           DitherMode
 ) {
 	//! Create image context
 	//! NOTE: 'const' violations in image data, but not modified so this is safe
@@ -55,9 +57,11 @@ DECLSPEC int QualetizeFromRawImage(
 	//! Do processing
 	//! NOTE: Do NOT allow image replacing, or things will go
 	//! very wrong when Qualetize() tries to free the pointers.
-	struct TilesData_t *TilesData = TilesData_FromBitmap(&Ctx, TileW, TileH, (const struct BGRA8_t*)BitRange);
+	struct TilesData_t *TilesData = TilesData_FromBitmap(&Ctx, TileW, TileH);
 	if(!TilesData) return 0;
-	(void)Qualetize(&Ctx, TilesData, DstPxIdx, (struct BGRAf_t*)DstPal, nPalettes, nColoursPerPalette, nUnusedColoursPerPalette, 0);
+	(void)Qualetize(
+		&Ctx, TilesData, DstPxIdx, (struct BGRAf_t*)DstPal, nPalettes, nColoursPerPalette, nUnusedColoursPerPalette, (const struct BGRA8_t*)BitRange, DitherMode, 0
+	);
 
 	//! Store tile palette indices
 	if(TilePalIdx) {