*合并master到minimal分支

1 files changed, 0 insertions, 93 deletions

diff --git a/src/libjin/Graphics/Font/je_decoder.cpp b/src/libjin/Graphics/Font/je_decoder.cpp
deleted file mode 100644
index 01e1990..0000000
--- a/src/libjin/Graphics/Font/je_decoder.cpp
+++ /dev/null
@@ -1,93 +0,0 @@
-#include <stdlib.h>
-#include <string.h>
-#include "je_decoder.h"
-
-namespace JinEngine
-{
-	namespace Graphics
-	{
-
-		/* utf8 byte string to unicode codepoint */
-		static const char *utf8toCodepoint(const char *p, unsigned *res) {
-			return nullptr;
-
-		}
-
-		/////////////////////////////////////////////////////////////////////////////
-		// decoders
-		/////////////////////////////////////////////////////////////////////////////
-
-		const void* Utf8::decode(const void* data, Codepoint* res) const
-		{
-			const char* p = (char*)data;
-			unsigned x, mask, shift;
-			switch (*p & 0xf0) {
-			case 0xf0:  mask = 0x07;  shift = 18;   break;
-			case 0xe0:  mask = 0x0f;  shift = 12;   break;
-			case 0xc0:
-			case 0xd0:  mask = 0x1f;  shift = 6;   break;
-			default:
-				*res = *p;
-				return p + 1;
-			}
-			x = (*p & mask) << shift;
-			do {
-				if (*(++p) == '\0') {
-					*res = x;
-					return p;
-				}
-				shift -= 6;
-				x |= (*p & 0x3f) << shift;
-			} while (shift);
-			*res = x;
-			return p + 1;
-		}
-
-		const void* Utf8::next(const void* data) const
-		{
-			const char* p = (char*)data;
-			unsigned x, mask, shift;
-			switch (*p & 0xf0) {
-			case 0xf0:  mask = 0x07;  shift = 18;   break;
-			case 0xe0:  mask = 0x0f;  shift = 12;   break;
-			case 0xc0:
-			case 0xd0:  mask = 0x1f;  shift = 6;   break;
-			default:
-				return p + 1;
-			}
-			x = (*p & mask) << shift;
-			do {
-				if (*(++p) == '\0') {
-					return p;
-				}
-				shift -= 6;
-				x |= (*p & 0x3f) << shift;
-			} while (shift);
-			return p + 1;
-		}
-	/*
-		const void* Utf16::decode(const void* data, Codepoint* res) const
-		{
-			return nullptr;
-		}
-
-		const void* Utf16::next(const void* data) const
-		{
-			return nullptr;
-		}
-	*/
-		const void* Ascii::decode(const void* data, Codepoint* res) const
-		{
-			const char* p = (char*)data;
-			*res = *p;
-			return p + 1;
-		}
-
-		const void* Ascii::next(const void* data) const
-		{
-			const char* p = (char*)data;
-			return p + 1;
-		}
-
-	} // namespace Graphics
-} // namespace JinEngine
\ No newline at end of file