Rename lots of files to help prevent compile time name conflicts.

4 files changed, 231 insertions, 231 deletions

diff --git a/src/gmisc/arrayops.c b/src/gmisc/gmisc_arrayops.c
index 1c4f821a..6e5442cd 100644
--- a/src/gmisc/arrayops.c
+++ b/src/gmisc/gmisc_arrayops.c
@@ -1,226 +1,226 @@
-/*

- * This file is subject to the terms of the GFX License. If a copy of

- * the license was not distributed with this file, you can obtain one at:

- *

- *              http://ugfx.org/license.html

- */

-

-/**

- * @file    src/gmisc/arrayops.c

- * @brief   GMISC Array Operations code.

- *

- * @addtogroup GMISC

- * @{

- */

-#include "gfx.h"

-

-#if GFX_USE_GMISC && GMISC_NEED_ARRAYOPS

-

-void gmiscArrayConvert(ArrayDataFormat srcfmt, void *src, ArrayDataFormat dstfmt, void *dst, size_t cnt) {

-	uint8_t		*src8, *dst8;

-	uint16_t	*src16, *dst16;

-

-	dst8 = dst;

-	dst16 = dst;

-	src8 = src;

-	src16 = src;

-

-	/* We do this as a big switch in order to optimise efficiency for each transfer type */

-	switch(dstfmt) {

-	case ARRAY_DATA_4BITUNSIGNED:

-		switch(srcfmt) {

-		case ARRAY_DATA_4BITUNSIGNED:	if (dst != src) while(cnt--) { *dst8++ = *src8++; }		break;

-		case ARRAY_DATA_4BITSIGNED:		while(cnt--) { *dst8++ = (*src8++ ^ 8); }				break;

-		case ARRAY_DATA_8BITUNSIGNED:	while(cnt--) { *dst8++ = *src8++ >> 4; }				break;

-		case ARRAY_DATA_8BITSIGNED:		while(cnt--) { *dst8++ = (*src8++ ^ 128) >> 4; }		break;

-		case ARRAY_DATA_10BITUNSIGNED:	while(cnt--) { *dst8++ = *src16++ >> 6; }				break;

-		case ARRAY_DATA_10BITSIGNED:	while(cnt--) { *dst8++ = (*src16++ ^ 512) >> 6; }		break;

-		case ARRAY_DATA_12BITUNSIGNED:	while(cnt--) { *dst8++ = *src16++ >> 8; }				break;

-		case ARRAY_DATA_12BITSIGNED:	while(cnt--) { *dst8++ = (*src16++ ^ 2048) >> 8; }		break;

-		case ARRAY_DATA_14BITUNSIGNED:	while(cnt--) { *dst8++ = *src16++ >> 10; }				break;

-		case ARRAY_DATA_14BITSIGNED:	while(cnt--) { *dst8++ = (*src16++ ^ 8192) >> 10; }		break;

-		case ARRAY_DATA_16BITUNSIGNED:	while(cnt--) { *dst8++ = *src16++ >> 12; }				break;

-		case ARRAY_DATA_16BITSIGNED:	while(cnt--) { *dst8++ = (*src16++ ^ 32768) >> 12; }	break;

-		}

-		break;

-	case ARRAY_DATA_4BITSIGNED:

-		switch(srcfmt) {

-		case ARRAY_DATA_4BITUNSIGNED:	while(cnt--) { *dst8++ = (*src8++ ^ 8); }				break;

-		case ARRAY_DATA_4BITSIGNED:		if (dst != src) while(cnt--) { *dst8++ = *src8++; }		break;

-		case ARRAY_DATA_8BITUNSIGNED:	while(cnt--) { *dst8++ = (*src8++ ^ 128) >> 4; }		break;

-		case ARRAY_DATA_8BITSIGNED:		while(cnt--) { *dst8++ = *src8++ >> 4; }				break;

-		case ARRAY_DATA_10BITUNSIGNED:	while(cnt--) { *dst8++ = (*src16++ ^ 512) >> 6; }		break;

-		case ARRAY_DATA_10BITSIGNED:	while(cnt--) { *dst8++ = *src16++ >> 6; }				break;

-		case ARRAY_DATA_12BITUNSIGNED:	while(cnt--) { *dst8++ = (*src16++ ^ 2048) >> 8; }		break;

-		case ARRAY_DATA_12BITSIGNED:	while(cnt--) { *dst8++ = *src16++ >> 8; }				break;

-		case ARRAY_DATA_14BITUNSIGNED:	while(cnt--) { *dst8++ = (*src16++ ^ 8192) >> 10; }		break;

-		case ARRAY_DATA_14BITSIGNED:	while(cnt--) { *dst8++ = *src16++ >> 10; }				break;

-		case ARRAY_DATA_16BITUNSIGNED:	while(cnt--) { *dst8++ = (*src16++ ^ 32768) >> 12; }	break;

-		case ARRAY_DATA_16BITSIGNED:	while(cnt--) { *dst8++ = *src16++ >> 12; }				break;

-		}

-		break;

-	case ARRAY_DATA_8BITUNSIGNED:

-		switch(srcfmt) {

-		case ARRAY_DATA_4BITUNSIGNED:	while(cnt--) { *dst8++ = *src8++ << 4; }				break;

-		case ARRAY_DATA_4BITSIGNED:		while(cnt--) { *dst8++ = (*src8++ ^ 8) << 4; }			break;

-		case ARRAY_DATA_8BITUNSIGNED:	if (dst != src) while(cnt--) { *dst8++ = *src8++; }		break;

-		case ARRAY_DATA_8BITSIGNED:		while(cnt--) { *dst8++ = (*src8++ ^ 128); }				break;

-		case ARRAY_DATA_10BITUNSIGNED:	while(cnt--) { *dst8++ = *src16++ >> 2; }				break;

-		case ARRAY_DATA_10BITSIGNED:	while(cnt--) { *dst8++ = (*src16++ ^ 512) >> 2; }		break;

-		case ARRAY_DATA_12BITUNSIGNED:	while(cnt--) { *dst8++ = *src16++ >> 4; }				break;

-		case ARRAY_DATA_12BITSIGNED:	while(cnt--) { *dst8++ = (*src16++ ^ 2048) >> 4; }		break;

-		case ARRAY_DATA_14BITUNSIGNED:	while(cnt--) { *dst8++ = *src16++ >> 6; }				break;

-		case ARRAY_DATA_14BITSIGNED:	while(cnt--) { *dst8++ = (*src16++ ^ 8192) >> 6; }		break;

-		case ARRAY_DATA_16BITUNSIGNED:	while(cnt--) { *dst8++ = *src16++ >> 8; }				break;

-		case ARRAY_DATA_16BITSIGNED:	while(cnt--) { *dst8++ = (*src16++ ^ 32768) >> 8; }		break;

-		}

-		break;

-	case ARRAY_DATA_8BITSIGNED:

-		switch(srcfmt) {

-		case ARRAY_DATA_4BITUNSIGNED:	while(cnt--) { *dst8++ = (*src8++ ^ 8) << 4; }			break;

-		case ARRAY_DATA_4BITSIGNED:		while(cnt--) { *dst8++ = *src8++ << 4; }				break;

-		case ARRAY_DATA_8BITUNSIGNED:	while(cnt--) { *dst8++ = (*src8++ ^ 128); }				break;

-		case ARRAY_DATA_8BITSIGNED:		if (dst != src) while(cnt--) { *dst8++ = *src8++; }		break;

-		case ARRAY_DATA_10BITUNSIGNED:	while(cnt--) { *dst8++ = (*src16++ ^ 512) >> 2; }		break;

-		case ARRAY_DATA_10BITSIGNED:	while(cnt--) { *dst8++ = *src16++ >> 2; }				break;

-		case ARRAY_DATA_12BITUNSIGNED:	while(cnt--) { *dst8++ = (*src16++ ^ 2048) >> 4; }		break;

-		case ARRAY_DATA_12BITSIGNED:	while(cnt--) { *dst8++ = *src16++ >> 4; }				break;

-		case ARRAY_DATA_14BITUNSIGNED:	while(cnt--) { *dst8++ = (*src16++ ^ 8192) >> 6; }		break;

-		case ARRAY_DATA_14BITSIGNED:	while(cnt--) { *dst8++ = *src16++ >> 6; }				break;

-		case ARRAY_DATA_16BITUNSIGNED:	while(cnt--) { *dst8++ = (*src16++ ^ 32768) >> 8; }		break;

-		case ARRAY_DATA_16BITSIGNED:	while(cnt--) { *dst8++ = *src16++ >> 8; }				break;

-		}

-		break;

-	case ARRAY_DATA_10BITUNSIGNED:

-		switch(srcfmt) {

-		case ARRAY_DATA_4BITUNSIGNED:	while(cnt--) { *dst16++ = *src8++ << 6; }				break;

-		case ARRAY_DATA_4BITSIGNED:		while(cnt--) { *dst16++ = (*src8++ ^ 8) << 6; }			break;

-		case ARRAY_DATA_8BITUNSIGNED:	while(cnt--) { *dst16++ = *src8++ << 2; }				break;

-		case ARRAY_DATA_8BITSIGNED:		while(cnt--) { *dst16++ = (*src8++ ^ 128) << 2; }		break;

-		case ARRAY_DATA_10BITUNSIGNED:	if (dst != src) while(cnt--) { *dst16++ = *src16++; }	break;

-		case ARRAY_DATA_10BITSIGNED:	while(cnt--) { *dst16++ = (*src16++ ^ 512); }			break;

-		case ARRAY_DATA_12BITUNSIGNED:	while(cnt--) { *dst16++ = *src16++ >> 2; }				break;

-		case ARRAY_DATA_12BITSIGNED:	while(cnt--) { *dst16++ = (*src16++ ^ 2048) >> 2; }		break;

-		case ARRAY_DATA_14BITUNSIGNED:	while(cnt--) { *dst16++ = *src16++ >> 4; }				break;

-		case ARRAY_DATA_14BITSIGNED:	while(cnt--) { *dst16++ = (*src16++ ^ 8192) >> 4; }		break;

-		case ARRAY_DATA_16BITUNSIGNED:	while(cnt--) { *dst16++ = *src16++ >> 6; }				break;

-		case ARRAY_DATA_16BITSIGNED:	while(cnt--) { *dst16++ = (*src16++ ^ 32768) >> 6; }	break;

-		}

-		break;

-	case ARRAY_DATA_10BITSIGNED:

-		switch(srcfmt) {

-		case ARRAY_DATA_4BITUNSIGNED:	while(cnt--) { *dst16++ = (*src8++ ^ 8) << 6; }			break;

-		case ARRAY_DATA_4BITSIGNED:		while(cnt--) { *dst16++ = *src8++ << 6; }				break;

-		case ARRAY_DATA_8BITUNSIGNED:	while(cnt--) { *dst16++ = (*src8++ ^ 128) << 2; }		break;

-		case ARRAY_DATA_8BITSIGNED:		while(cnt--) { *dst16++ = *src8++ << 2; }				break;

-		case ARRAY_DATA_10BITUNSIGNED:	while(cnt--) { *dst16++ = (*src16++ ^ 512); }			break;

-		case ARRAY_DATA_10BITSIGNED:	if (dst != src) while(cnt--) { *dst16++ = *src16++; }	break;

-		case ARRAY_DATA_12BITUNSIGNED:	while(cnt--) { *dst16++ = (*src16++ ^ 2048) >> 2; }		break;

-		case ARRAY_DATA_12BITSIGNED:	while(cnt--) { *dst16++ = *src16++ >> 2; }				break;

-		case ARRAY_DATA_14BITUNSIGNED:	while(cnt--) { *dst16++ = (*src16++ ^ 8192) >> 4; }		break;

-		case ARRAY_DATA_14BITSIGNED:	while(cnt--) { *dst16++ = *src16++ >> 4; }				break;

-		case ARRAY_DATA_16BITUNSIGNED:	while(cnt--) { *dst16++ = (*src16++ ^ 32768) >> 6; }	break;

-		case ARRAY_DATA_16BITSIGNED:	while(cnt--) { *dst16++ = *src16++ >> 6; }				break;

-		}

-		break;

-	case ARRAY_DATA_12BITUNSIGNED:

-		switch(srcfmt) {

-		case ARRAY_DATA_4BITUNSIGNED:	while(cnt--) { *dst16++ = *src8++ << 8; }				break;

-		case ARRAY_DATA_4BITSIGNED:		while(cnt--) { *dst16++ = (*src8++ ^ 8) << 8; }			break;

-		case ARRAY_DATA_8BITUNSIGNED:	while(cnt--) { *dst16++ = *src8++ << 4; }				break;

-		case ARRAY_DATA_8BITSIGNED:		while(cnt--) { *dst16++ = (*src8++ ^ 128) << 4; }		break;

-		case ARRAY_DATA_10BITUNSIGNED:	while(cnt--) { *dst16++ = *src16++ << 2; }				break;

-		case ARRAY_DATA_10BITSIGNED:	while(cnt--) { *dst16++ = (*src16++ ^ 512) << 2; }		break;

-		case ARRAY_DATA_12BITUNSIGNED:	if (dst != src) while(cnt--) { *dst16++ = *src16++; }	break;

-		case ARRAY_DATA_12BITSIGNED:	while(cnt--) { *dst16++ = (*src16++ ^ 2048); }			break;

-		case ARRAY_DATA_14BITUNSIGNED:	while(cnt--) { *dst16++ = *src16++ >> 2; }				break;

-		case ARRAY_DATA_14BITSIGNED:	while(cnt--) { *dst16++ = (*src16++ ^ 8192) >> 2; }		break;

-		case ARRAY_DATA_16BITUNSIGNED:	while(cnt--) { *dst16++ = *src16++ >> 4; }				break;

-		case ARRAY_DATA_16BITSIGNED:	while(cnt--) { *dst16++ = (*src16++ ^ 32768) >> 4; }	break;

-		}

-		break;

-	case ARRAY_DATA_12BITSIGNED:

-		switch(srcfmt) {

-		case ARRAY_DATA_4BITUNSIGNED:	while(cnt--) { *dst16++ = (*src8++ ^ 8) << 8; }			break;

-		case ARRAY_DATA_4BITSIGNED:		while(cnt--) { *dst16++ = *src8++ << 8; }				break;

-		case ARRAY_DATA_8BITUNSIGNED:	while(cnt--) { *dst16++ = (*src8++ ^ 128) << 4; }		break;

-		case ARRAY_DATA_8BITSIGNED:		while(cnt--) { *dst16++ = *src8++ << 4; }				break;

-		case ARRAY_DATA_10BITUNSIGNED:	while(cnt--) { *dst16++ = (*src16++ ^ 512) << 2; }		break;

-		case ARRAY_DATA_10BITSIGNED:	while(cnt--) { *dst16++ = *src16++ << 2; }				break;

-		case ARRAY_DATA_12BITUNSIGNED:	while(cnt--) { *dst16++ = (*src16++ ^ 2048); }			break;

-		case ARRAY_DATA_12BITSIGNED:	if (dst != src) while(cnt--) { *dst16++ = *src16++; }	break;

-		case ARRAY_DATA_14BITUNSIGNED:	while(cnt--) { *dst16++ = (*src16++ ^ 8192) >> 2; }		break;

-		case ARRAY_DATA_14BITSIGNED:	while(cnt--) { *dst16++ = *src16++ >> 2; }				break;

-		case ARRAY_DATA_16BITUNSIGNED:	while(cnt--) { *dst16++ = (*src16++ ^ 32768) >> 4; }	break;

-		case ARRAY_DATA_16BITSIGNED:	while(cnt--) { *dst16++ = *src16++ >> 4; }				break;

-		}

-		break;

-	case ARRAY_DATA_14BITUNSIGNED:

-		switch(srcfmt) {

-		case ARRAY_DATA_4BITUNSIGNED:	while(cnt--) { *dst16++ = *src8++ << 10; }				break;

-		case ARRAY_DATA_4BITSIGNED:		while(cnt--) { *dst16++ = (*src8++ ^ 8) << 10; }		break;

-		case ARRAY_DATA_8BITUNSIGNED:	while(cnt--) { *dst16++ = *src8++ << 6; }				break;

-		case ARRAY_DATA_8BITSIGNED:		while(cnt--) { *dst16++ = (*src8++ ^ 128) << 6; }		break;

-		case ARRAY_DATA_10BITUNSIGNED:	while(cnt--) { *dst16++ = *src16++ << 4; }				break;

-		case ARRAY_DATA_10BITSIGNED:	while(cnt--) { *dst16++ = (*src16++ ^ 512) << 4; }		break;

-		case ARRAY_DATA_12BITUNSIGNED:	while(cnt--) { *dst16++ = *src16++ << 2; }				break;

-		case ARRAY_DATA_12BITSIGNED:	while(cnt--) { *dst16++ = (*src16++ ^ 2048) >> 2; }		break;

-		case ARRAY_DATA_14BITUNSIGNED:	if (dst != src) while(cnt--) { *dst16++ = *src16++; }	break;

-		case ARRAY_DATA_14BITSIGNED:	while(cnt--) { *dst16++ = (*src16++ ^ 8192); }			break;

-		case ARRAY_DATA_16BITUNSIGNED:	while(cnt--) { *dst16++ = *src16++ >> 2; }				break;

-		case ARRAY_DATA_16BITSIGNED:	while(cnt--) { *dst16++ = (*src16++ ^ 32768) >> 2; }	break;

-		}

-		break;

-	case ARRAY_DATA_14BITSIGNED:

-		switch(srcfmt) {

-		case ARRAY_DATA_4BITUNSIGNED:	while(cnt--) { *dst16++ = (*src8++ ^ 8) << 10; }		break;

-		case ARRAY_DATA_4BITSIGNED:		while(cnt--) { *dst16++ = *src8++ << 10; }				break;

-		case ARRAY_DATA_8BITUNSIGNED:	while(cnt--) { *dst16++ = (*src8++ ^ 128) << 6; }		break;

-		case ARRAY_DATA_8BITSIGNED:		while(cnt--) { *dst16++ = *src8++ << 6; }				break;

-		case ARRAY_DATA_10BITUNSIGNED:	while(cnt--) { *dst16++ = (*src16++ ^ 512) << 4; }		break;

-		case ARRAY_DATA_10BITSIGNED:	while(cnt--) { *dst16++ = *src16++ << 4; }				break;

-		case ARRAY_DATA_12BITUNSIGNED:	while(cnt--) { *dst16++ = (*src16++ ^ 2048) << 2; }		break;

-		case ARRAY_DATA_12BITSIGNED:	while(cnt--) { *dst16++ = *src16++ << 2; }				break;

-		case ARRAY_DATA_14BITUNSIGNED:	while(cnt--) { *dst16++ = (*src16++ ^ 8192); }			break;

-		case ARRAY_DATA_14BITSIGNED:	if (dst != src) while(cnt--) { *dst16++ = *src16++; }	break;

-		case ARRAY_DATA_16BITUNSIGNED:	while(cnt--) { *dst16++ = (*src16++ ^ 32768) >> 2; }	break;

-		case ARRAY_DATA_16BITSIGNED:	while(cnt--) { *dst16++ = *src16++ >> 2; }				break;

-		}

-		break;

-	case ARRAY_DATA_16BITUNSIGNED:

-		switch(srcfmt) {

-		case ARRAY_DATA_4BITUNSIGNED:	while(cnt--) { *dst16++ = *src8++ << 12; }				break;

-		case ARRAY_DATA_4BITSIGNED:		while(cnt--) { *dst16++ = (*src8++ ^ 8) << 12; }		break;

-		case ARRAY_DATA_8BITUNSIGNED:	while(cnt--) { *dst16++ = *src8++ << 8; }				break;

-		case ARRAY_DATA_8BITSIGNED:		while(cnt--) { *dst16++ = (*src8++ ^ 128) << 8; }		break;

-		case ARRAY_DATA_10BITUNSIGNED:	while(cnt--) { *dst16++ = *src16++ << 6; }				break;

-		case ARRAY_DATA_10BITSIGNED:	while(cnt--) { *dst16++ = (*src16++ ^ 512) << 6; }		break;

-		case ARRAY_DATA_12BITUNSIGNED:	while(cnt--) { *dst16++ = *src16++ << 4; }				break;

-		case ARRAY_DATA_12BITSIGNED:	while(cnt--) { *dst16++ = (*src16++ ^ 2048) >> 4; }		break;

-		case ARRAY_DATA_14BITUNSIGNED:	while(cnt--) { *dst16++ = *src16++ >> 2; }				break;

-		case ARRAY_DATA_14BITSIGNED:	while(cnt--) { *dst16++ = (*src16++ ^ 8192) >> 2; }		break;

-		case ARRAY_DATA_16BITUNSIGNED:	if (dst != src) while(cnt--) { *dst16++ = *src16++; }	break;

-		case ARRAY_DATA_16BITSIGNED:	while(cnt--) { *dst16++ = (*src16++ ^ 32768); }			break;

-		}

-		break;

-	case ARRAY_DATA_16BITSIGNED:

-		switch(srcfmt) {

-		case ARRAY_DATA_4BITUNSIGNED:	while(cnt--) { *dst16++ = (*src8++ ^ 8) << 12; }		break;

-		case ARRAY_DATA_4BITSIGNED:		while(cnt--) { *dst16++ = *src8++ << 12; }				break;

-		case ARRAY_DATA_8BITUNSIGNED:	while(cnt--) { *dst16++ = (*src8++ ^ 128) << 8; }		break;

-		case ARRAY_DATA_8BITSIGNED:		while(cnt--) { *dst16++ = *src8++ << 8; }				break;

-		case ARRAY_DATA_10BITUNSIGNED:	while(cnt--) { *dst16++ = (*src16++ ^ 512) << 6; }		break;

-		case ARRAY_DATA_10BITSIGNED:	while(cnt--) { *dst16++ = *src16++ << 6; }				break;

-		case ARRAY_DATA_12BITUNSIGNED:	while(cnt--) { *dst16++ = (*src16++ ^ 2048) << 4; }		break;

-		case ARRAY_DATA_12BITSIGNED:	while(cnt--) { *dst16++ = *src16++ << 4; }				break;

-		case ARRAY_DATA_14BITUNSIGNED:	while(cnt--) { *dst16++ = (*src16++ ^ 8192) << 2; }		break;

-		case ARRAY_DATA_14BITSIGNED:	while(cnt--) { *dst16++ = *src16++ >> 2; }				break;

-		case ARRAY_DATA_16BITUNSIGNED:	while(cnt--) { *dst16++ = (*src16++ ^ 32768); }			break;

-		case ARRAY_DATA_16BITSIGNED:	if (dst != src) while(cnt--) { *dst16++ = *src16++; }	break;

-		}

-		break;

-	}

-}

-

-#endif /* GFX_USE_GMISC && GMISC_NEED_ARRAYOPS */

-/** @} */

+/*
+ * This file is subject to the terms of the GFX License. If a copy of
+ * the license was not distributed with this file, you can obtain one at:
+ *
+ *              http://ugfx.org/license.html
+ */
+
+/**
+ * @file    src/gmisc/gmisc_arrayops.c
+ * @brief   GMISC Array Operations code.
+ *
+ * @addtogroup GMISC
+ * @{
+ */
+#include "gfx.h"
+
+#if GFX_USE_GMISC && GMISC_NEED_ARRAYOPS
+
+void gmiscArrayConvert(ArrayDataFormat srcfmt, void *src, ArrayDataFormat dstfmt, void *dst, size_t cnt) {
+	uint8_t		*src8, *dst8;
+	uint16_t	*src16, *dst16;
+
+	dst8 = dst;
+	dst16 = dst;
+	src8 = src;
+	src16 = src;
+
+	/* We do this as a big switch in order to optimise efficiency for each transfer type */
+	switch(dstfmt) {
+	case ARRAY_DATA_4BITUNSIGNED:
+		switch(srcfmt) {
+		case ARRAY_DATA_4BITUNSIGNED:	if (dst != src) while(cnt--) { *dst8++ = *src8++; }		break;
+		case ARRAY_DATA_4BITSIGNED:		while(cnt--) { *dst8++ = (*src8++ ^ 8); }				break;
+		case ARRAY_DATA_8BITUNSIGNED:	while(cnt--) { *dst8++ = *src8++ >> 4; }				break;
+		case ARRAY_DATA_8BITSIGNED:		while(cnt--) { *dst8++ = (*src8++ ^ 128) >> 4; }		break;
+		case ARRAY_DATA_10BITUNSIGNED:	while(cnt--) { *dst8++ = *src16++ >> 6; }				break;
+		case ARRAY_DATA_10BITSIGNED:	while(cnt--) { *dst8++ = (*src16++ ^ 512) >> 6; }		break;
+		case ARRAY_DATA_12BITUNSIGNED:	while(cnt--) { *dst8++ = *src16++ >> 8; }				break;
+		case ARRAY_DATA_12BITSIGNED:	while(cnt--) { *dst8++ = (*src16++ ^ 2048) >> 8; }		break;
+		case ARRAY_DATA_14BITUNSIGNED:	while(cnt--) { *dst8++ = *src16++ >> 10; }				break;
+		case ARRAY_DATA_14BITSIGNED:	while(cnt--) { *dst8++ = (*src16++ ^ 8192) >> 10; }		break;
+		case ARRAY_DATA_16BITUNSIGNED:	while(cnt--) { *dst8++ = *src16++ >> 12; }				break;
+		case ARRAY_DATA_16BITSIGNED:	while(cnt--) { *dst8++ = (*src16++ ^ 32768) >> 12; }	break;
+		}
+		break;
+	case ARRAY_DATA_4BITSIGNED:
+		switch(srcfmt) {
+		case ARRAY_DATA_4BITUNSIGNED:	while(cnt--) { *dst8++ = (*src8++ ^ 8); }				break;
+		case ARRAY_DATA_4BITSIGNED:		if (dst != src) while(cnt--) { *dst8++ = *src8++; }		break;
+		case ARRAY_DATA_8BITUNSIGNED:	while(cnt--) { *dst8++ = (*src8++ ^ 128) >> 4; }		break;
+		case ARRAY_DATA_8BITSIGNED:		while(cnt--) { *dst8++ = *src8++ >> 4; }				break;
+		case ARRAY_DATA_10BITUNSIGNED:	while(cnt--) { *dst8++ = (*src16++ ^ 512) >> 6; }		break;
+		case ARRAY_DATA_10BITSIGNED:	while(cnt--) { *dst8++ = *src16++ >> 6; }				break;
+		case ARRAY_DATA_12BITUNSIGNED:	while(cnt--) { *dst8++ = (*src16++ ^ 2048) >> 8; }		break;
+		case ARRAY_DATA_12BITSIGNED:	while(cnt--) { *dst8++ = *src16++ >> 8; }				break;
+		case ARRAY_DATA_14BITUNSIGNED:	while(cnt--) { *dst8++ = (*src16++ ^ 8192) >> 10; }		break;
+		case ARRAY_DATA_14BITSIGNED:	while(cnt--) { *dst8++ = *src16++ >> 10; }				break;
+		case ARRAY_DATA_16BITUNSIGNED:	while(cnt--) { *dst8++ = (*src16++ ^ 32768) >> 12; }	break;
+		case ARRAY_DATA_16BITSIGNED:	while(cnt--) { *dst8++ = *src16++ >> 12; }				break;
+		}
+		break;
+	case ARRAY_DATA_8BITUNSIGNED:
+		switch(srcfmt) {
+		case ARRAY_DATA_4BITUNSIGNED:	while(cnt--) { *dst8++ = *src8++ << 4; }				break;
+		case ARRAY_DATA_4BITSIGNED:		while(cnt--) { *dst8++ = (*src8++ ^ 8) << 4; }			break;
+		case ARRAY_DATA_8BITUNSIGNED:	if (dst != src) while(cnt--) { *dst8++ = *src8++; }		break;
+		case ARRAY_DATA_8BITSIGNED:		while(cnt--) { *dst8++ = (*src8++ ^ 128); }				break;
+		case ARRAY_DATA_10BITUNSIGNED:	while(cnt--) { *dst8++ = *src16++ >> 2; }				break;
+		case ARRAY_DATA_10BITSIGNED:	while(cnt--) { *dst8++ = (*src16++ ^ 512) >> 2; }		break;
+		case ARRAY_DATA_12BITUNSIGNED:	while(cnt--) { *dst8++ = *src16++ >> 4; }				break;
+		case ARRAY_DATA_12BITSIGNED:	while(cnt--) { *dst8++ = (*src16++ ^ 2048) >> 4; }		break;
+		case ARRAY_DATA_14BITUNSIGNED:	while(cnt--) { *dst8++ = *src16++ >> 6; }				break;
+		case ARRAY_DATA_14BITSIGNED:	while(cnt--) { *dst8++ = (*src16++ ^ 8192) >> 6; }		break;
+		case ARRAY_DATA_16BITUNSIGNED:	while(cnt--) { *dst8++ = *src16++ >> 8; }				break;
+		case ARRAY_DATA_16BITSIGNED:	while(cnt--) { *dst8++ = (*src16++ ^ 32768) >> 8; }		break;
+		}
+		break;
+	case ARRAY_DATA_8BITSIGNED:
+		switch(srcfmt) {
+		case ARRAY_DATA_4BITUNSIGNED:	while(cnt--) { *dst8++ = (*src8++ ^ 8) << 4; }			break;
+		case ARRAY_DATA_4BITSIGNED:		while(cnt--) { *dst8++ = *src8++ << 4; }				break;
+		case ARRAY_DATA_8BITUNSIGNED:	while(cnt--) { *dst8++ = (*src8++ ^ 128); }				break;
+		case ARRAY_DATA_8BITSIGNED:		if (dst != src) while(cnt--) { *dst8++ = *src8++; }		break;
+		case ARRAY_DATA_10BITUNSIGNED:	while(cnt--) { *dst8++ = (*src16++ ^ 512) >> 2; }		break;
+		case ARRAY_DATA_10BITSIGNED:	while(cnt--) { *dst8++ = *src16++ >> 2; }				break;
+		case ARRAY_DATA_12BITUNSIGNED:	while(cnt--) { *dst8++ = (*src16++ ^ 2048) >> 4; }		break;
+		case ARRAY_DATA_12BITSIGNED:	while(cnt--) { *dst8++ = *src16++ >> 4; }				break;
+		case ARRAY_DATA_14BITUNSIGNED:	while(cnt--) { *dst8++ = (*src16++ ^ 8192) >> 6; }		break;
+		case ARRAY_DATA_14BITSIGNED:	while(cnt--) { *dst8++ = *src16++ >> 6; }				break;
+		case ARRAY_DATA_16BITUNSIGNED:	while(cnt--) { *dst8++ = (*src16++ ^ 32768) >> 8; }		break;
+		case ARRAY_DATA_16BITSIGNED:	while(cnt--) { *dst8++ = *src16++ >> 8; }				break;
+		}
+		break;
+	case ARRAY_DATA_10BITUNSIGNED:
+		switch(srcfmt) {
+		case ARRAY_DATA_4BITUNSIGNED:	while(cnt--) { *dst16++ = *src8++ << 6; }				break;
+		case ARRAY_DATA_4BITSIGNED:		while(cnt--) { *dst16++ = (*src8++ ^ 8) << 6; }			break;
+		case ARRAY_DATA_8BITUNSIGNED:	while(cnt--) { *dst16++ = *src8++ << 2; }				break;
+		case ARRAY_DATA_8BITSIGNED:		while(cnt--) { *dst16++ = (*src8++ ^ 128) << 2; }		break;
+		case ARRAY_DATA_10BITUNSIGNED:	if (dst != src) while(cnt--) { *dst16++ = *src16++; }	break;
+		case ARRAY_DATA_10BITSIGNED:	while(cnt--) { *dst16++ = (*src16++ ^ 512); }			break;
+		case ARRAY_DATA_12BITUNSIGNED:	while(cnt--) { *dst16++ = *src16++ >> 2; }				break;
+		case ARRAY_DATA_12BITSIGNED:	while(cnt--) { *dst16++ = (*src16++ ^ 2048) >> 2; }		break;
+		case ARRAY_DATA_14BITUNSIGNED:	while(cnt--) { *dst16++ = *src16++ >> 4; }				break;
+		case ARRAY_DATA_14BITSIGNED:	while(cnt--) { *dst16++ = (*src16++ ^ 8192) >> 4; }		break;
+		case ARRAY_DATA_16BITUNSIGNED:	while(cnt--) { *dst16++ = *src16++ >> 6; }				break;
+		case ARRAY_DATA_16BITSIGNED:	while(cnt--) { *dst16++ = (*src16++ ^ 32768) >> 6; }	break;
+		}
+		break;
+	case ARRAY_DATA_10BITSIGNED:
+		switch(srcfmt) {
+		case ARRAY_DATA_4BITUNSIGNED:	while(cnt--) { *dst16++ = (*src8++ ^ 8) << 6; }			break;
+		case ARRAY_DATA_4BITSIGNED:		while(cnt--) { *dst16++ = *src8++ << 6; }				break;
+		case ARRAY_DATA_8BITUNSIGNED:	while(cnt--) { *dst16++ = (*src8++ ^ 128) << 2; }		break;
+		case ARRAY_DATA_8BITSIGNED:		while(cnt--) { *dst16++ = *src8++ << 2; }				break;
+		case ARRAY_DATA_10BITUNSIGNED:	while(cnt--) { *dst16++ = (*src16++ ^ 512); }			break;
+		case ARRAY_DATA_10BITSIGNED:	if (dst != src) while(cnt--) { *dst16++ = *src16++; }	break;
+		case ARRAY_DATA_12BITUNSIGNED:	while(cnt--) { *dst16++ = (*src16++ ^ 2048) >> 2; }		break;
+		case ARRAY_DATA_12BITSIGNED:	while(cnt--) { *dst16++ = *src16++ >> 2; }				break;
+		case ARRAY_DATA_14BITUNSIGNED:	while(cnt--) { *dst16++ = (*src16++ ^ 8192) >> 4; }		break;
+		case ARRAY_DATA_14BITSIGNED:	while(cnt--) { *dst16++ = *src16++ >> 4; }				break;
+		case ARRAY_DATA_16BITUNSIGNED:	while(cnt--) { *dst16++ = (*src16++ ^ 32768) >> 6; }	break;
+		case ARRAY_DATA_16BITSIGNED:	while(cnt--) { *dst16++ = *src16++ >> 6; }				break;
+		}
+		break;
+	case ARRAY_DATA_12BITUNSIGNED:
+		switch(srcfmt) {
+		case ARRAY_DATA_4BITUNSIGNED:	while(cnt--) { *dst16++ = *src8++ << 8; }				break;
+		case ARRAY_DATA_4BITSIGNED:		while(cnt--) { *dst16++ = (*src8++ ^ 8) << 8; }			break;
+		case ARRAY_DATA_8BITUNSIGNED:	while(cnt--) { *dst16++ = *src8++ << 4; }				break;
+		case ARRAY_DATA_8BITSIGNED:		while(cnt--) { *dst16++ = (*src8++ ^ 128) << 4; }		break;
+		case ARRAY_DATA_10BITUNSIGNED:	while(cnt--) { *dst16++ = *src16++ << 2; }				break;
+		case ARRAY_DATA_10BITSIGNED:	while(cnt--) { *dst16++ = (*src16++ ^ 512) << 2; }		break;
+		case ARRAY_DATA_12BITUNSIGNED:	if (dst != src) while(cnt--) { *dst16++ = *src16++; }	break;
+		case ARRAY_DATA_12BITSIGNED:	while(cnt--) { *dst16++ = (*src16++ ^ 2048); }			break;
+		case ARRAY_DATA_14BITUNSIGNED:	while(cnt--) { *dst16++ = *src16++ >> 2; }				break;
+		case ARRAY_DATA_14BITSIGNED:	while(cnt--) { *dst16++ = (*src16++ ^ 8192) >> 2; }		break;
+		case ARRAY_DATA_16BITUNSIGNED:	while(cnt--) { *dst16++ = *src16++ >> 4; }				break;
+		case ARRAY_DATA_16BITSIGNED:	while(cnt--) { *dst16++ = (*src16++ ^ 32768) >> 4; }	break;
+		}
+		break;
+	case ARRAY_DATA_12BITSIGNED:
+		switch(srcfmt) {
+		case ARRAY_DATA_4BITUNSIGNED:	while(cnt--) { *dst16++ = (*src8++ ^ 8) << 8; }			break;
+		case ARRAY_DATA_4BITSIGNED:		while(cnt--) { *dst16++ = *src8++ << 8; }				break;
+		case ARRAY_DATA_8BITUNSIGNED:	while(cnt--) { *dst16++ = (*src8++ ^ 128) << 4; }		break;
+		case ARRAY_DATA_8BITSIGNED:		while(cnt--) { *dst16++ = *src8++ << 4; }				break;
+		case ARRAY_DATA_10BITUNSIGNED:	while(cnt--) { *dst16++ = (*src16++ ^ 512) << 2; }		break;
+		case ARRAY_DATA_10BITSIGNED:	while(cnt--) { *dst16++ = *src16++ << 2; }				break;
+		case ARRAY_DATA_12BITUNSIGNED:	while(cnt--) { *dst16++ = (*src16++ ^ 2048); }			break;
+		case ARRAY_DATA_12BITSIGNED:	if (dst != src) while(cnt--) { *dst16++ = *src16++; }	break;
+		case ARRAY_DATA_14BITUNSIGNED:	while(cnt--) { *dst16++ = (*src16++ ^ 8192) >> 2; }		break;
+		case ARRAY_DATA_14BITSIGNED:	while(cnt--) { *dst16++ = *src16++ >> 2; }				break;
+		case ARRAY_DATA_16BITUNSIGNED:	while(cnt--) { *dst16++ = (*src16++ ^ 32768) >> 4; }	break;
+		case ARRAY_DATA_16BITSIGNED:	while(cnt--) { *dst16++ = *src16++ >> 4; }				break;
+		}
+		break;
+	case ARRAY_DATA_14BITUNSIGNED:
+		switch(srcfmt) {
+		case ARRAY_DATA_4BITUNSIGNED:	while(cnt--) { *dst16++ = *src8++ << 10; }				break;
+		case ARRAY_DATA_4BITSIGNED:		while(cnt--) { *dst16++ = (*src8++ ^ 8) << 10; }		break;
+		case ARRAY_DATA_8BITUNSIGNED:	while(cnt--) { *dst16++ = *src8++ << 6; }				break;
+		case ARRAY_DATA_8BITSIGNED:		while(cnt--) { *dst16++ = (*src8++ ^ 128) << 6; }		break;
+		case ARRAY_DATA_10BITUNSIGNED:	while(cnt--) { *dst16++ = *src16++ << 4; }				break;
+		case ARRAY_DATA_10BITSIGNED:	while(cnt--) { *dst16++ = (*src16++ ^ 512) << 4; }		break;
+		case ARRAY_DATA_12BITUNSIGNED:	while(cnt--) { *dst16++ = *src16++ << 2; }				break;
+		case ARRAY_DATA_12BITSIGNED:	while(cnt--) { *dst16++ = (*src16++ ^ 2048) >> 2; }		break;
+		case ARRAY_DATA_14BITUNSIGNED:	if (dst != src) while(cnt--) { *dst16++ = *src16++; }	break;
+		case ARRAY_DATA_14BITSIGNED:	while(cnt--) { *dst16++ = (*src16++ ^ 8192); }			break;
+		case ARRAY_DATA_16BITUNSIGNED:	while(cnt--) { *dst16++ = *src16++ >> 2; }				break;
+		case ARRAY_DATA_16BITSIGNED:	while(cnt--) { *dst16++ = (*src16++ ^ 32768) >> 2; }	break;
+		}
+		break;
+	case ARRAY_DATA_14BITSIGNED:
+		switch(srcfmt) {
+		case ARRAY_DATA_4BITUNSIGNED:	while(cnt--) { *dst16++ = (*src8++ ^ 8) << 10; }		break;
+		case ARRAY_DATA_4BITSIGNED:		while(cnt--) { *dst16++ = *src8++ << 10; }				break;
+		case ARRAY_DATA_8BITUNSIGNED:	while(cnt--) { *dst16++ = (*src8++ ^ 128) << 6; }		break;
+		case ARRAY_DATA_8BITSIGNED:		while(cnt--) { *dst16++ = *src8++ << 6; }				break;
+		case ARRAY_DATA_10BITUNSIGNED:	while(cnt--) { *dst16++ = (*src16++ ^ 512) << 4; }		break;
+		case ARRAY_DATA_10BITSIGNED:	while(cnt--) { *dst16++ = *src16++ << 4; }				break;
+		case ARRAY_DATA_12BITUNSIGNED:	while(cnt--) { *dst16++ = (*src16++ ^ 2048) << 2; }		break;
+		case ARRAY_DATA_12BITSIGNED:	while(cnt--) { *dst16++ = *src16++ << 2; }				break;
+		case ARRAY_DATA_14BITUNSIGNED:	while(cnt--) { *dst16++ = (*src16++ ^ 8192); }			break;
+		case ARRAY_DATA_14BITSIGNED:	if (dst != src) while(cnt--) { *dst16++ = *src16++; }	break;
+		case ARRAY_DATA_16BITUNSIGNED:	while(cnt--) { *dst16++ = (*src16++ ^ 32768) >> 2; }	break;
+		case ARRAY_DATA_16BITSIGNED:	while(cnt--) { *dst16++ = *src16++ >> 2; }				break;
+		}
+		break;
+	case ARRAY_DATA_16BITUNSIGNED:
+		switch(srcfmt) {
+		case ARRAY_DATA_4BITUNSIGNED:	while(cnt--) { *dst16++ = *src8++ << 12; }				break;
+		case ARRAY_DATA_4BITSIGNED:		while(cnt--) { *dst16++ = (*src8++ ^ 8) << 12; }		break;
+		case ARRAY_DATA_8BITUNSIGNED:	while(cnt--) { *dst16++ = *src8++ << 8; }				break;
+		case ARRAY_DATA_8BITSIGNED:		while(cnt--) { *dst16++ = (*src8++ ^ 128) << 8; }		break;
+		case ARRAY_DATA_10BITUNSIGNED:	while(cnt--) { *dst16++ = *src16++ << 6; }				break;
+		case ARRAY_DATA_10BITSIGNED:	while(cnt--) { *dst16++ = (*src16++ ^ 512) << 6; }		break;
+		case ARRAY_DATA_12BITUNSIGNED:	while(cnt--) { *dst16++ = *src16++ << 4; }				break;
+		case ARRAY_DATA_12BITSIGNED:	while(cnt--) { *dst16++ = (*src16++ ^ 2048) >> 4; }		break;
+		case ARRAY_DATA_14BITUNSIGNED:	while(cnt--) { *dst16++ = *src16++ >> 2; }				break;
+		case ARRAY_DATA_14BITSIGNED:	while(cnt--) { *dst16++ = (*src16++ ^ 8192) >> 2; }		break;
+		case ARRAY_DATA_16BITUNSIGNED:	if (dst != src) while(cnt--) { *dst16++ = *src16++; }	break;
+		case ARRAY_DATA_16BITSIGNED:	while(cnt--) { *dst16++ = (*src16++ ^ 32768); }			break;
+		}
+		break;
+	case ARRAY_DATA_16BITSIGNED:
+		switch(srcfmt) {
+		case ARRAY_DATA_4BITUNSIGNED:	while(cnt--) { *dst16++ = (*src8++ ^ 8) << 12; }		break;
+		case ARRAY_DATA_4BITSIGNED:		while(cnt--) { *dst16++ = *src8++ << 12; }				break;
+		case ARRAY_DATA_8BITUNSIGNED:	while(cnt--) { *dst16++ = (*src8++ ^ 128) << 8; }		break;
+		case ARRAY_DATA_8BITSIGNED:		while(cnt--) { *dst16++ = *src8++ << 8; }				break;
+		case ARRAY_DATA_10BITUNSIGNED:	while(cnt--) { *dst16++ = (*src16++ ^ 512) << 6; }		break;
+		case ARRAY_DATA_10BITSIGNED:	while(cnt--) { *dst16++ = *src16++ << 6; }				break;
+		case ARRAY_DATA_12BITUNSIGNED:	while(cnt--) { *dst16++ = (*src16++ ^ 2048) << 4; }		break;
+		case ARRAY_DATA_12BITSIGNED:	while(cnt--) { *dst16++ = *src16++ << 4; }				break;
+		case ARRAY_DATA_14BITUNSIGNED:	while(cnt--) { *dst16++ = (*src16++ ^ 8192) << 2; }		break;
+		case ARRAY_DATA_14BITSIGNED:	while(cnt--) { *dst16++ = *src16++ >> 2; }				break;
+		case ARRAY_DATA_16BITUNSIGNED:	while(cnt--) { *dst16++ = (*src16++ ^ 32768); }			break;
+		case ARRAY_DATA_16BITSIGNED:	if (dst != src) while(cnt--) { *dst16++ = *src16++; }	break;
+		}
+		break;
+	}
+}
+
+#endif /* GFX_USE_GMISC && GMISC_NEED_ARRAYOPS */
+/** @} */
diff --git a/src/gmisc/gmisc.c b/src/gmisc/gmisc_gmisc.c
index 654dd5e2..3121182f 100644
--- a/src/gmisc/gmisc.c
+++ b/src/gmisc/gmisc_gmisc.c
@@ -6,7 +6,7 @@
  */
 
 /**
- * @file    src/gmisc/gmisc.c
+ * @file    src/gmisc/gmisc_gmisc.c
  * @brief   GMISC Functions.
  *
  */
diff --git a/src/gmisc/trig.c b/src/gmisc/gmisc_trig.c
index 3c6dd461..7314f389 100644
--- a/src/gmisc/trig.c
+++ b/src/gmisc/gmisc_trig.c
@@ -6,7 +6,7 @@
  */
 
 /**
- * @file    src/gmisc/trig.c
+ * @file    src/gmisc/gmisc_trig.c
  * @brief   GMISC Trig Functions.
  *
  * @addtogroup GMISC
diff --git a/src/gmisc/sys_make.mk b/src/gmisc/sys_make.mk
index 66d19ab0..0431c134 100644
--- a/src/gmisc/sys_make.mk
+++ b/src/gmisc/sys_make.mk
@@ -1,3 +1,3 @@
-GFXSRC +=   $(GFXLIB)/src/gmisc/gmisc.c	\
-			$(GFXLIB)/src/gmisc/arrayops.c	\
-			$(GFXLIB)/src/gmisc/trig.c
+GFXSRC +=   $(GFXLIB)/src/gmisc/gmisc_gmisc.c	\
+			$(GFXLIB)/src/gmisc/gmisc_arrayops.c	\
+			$(GFXLIB)/src/gmisc/gmisc_trig.c