bump version 2018.10.19 (beta)

fixed color font problem on BGR layout
snowie2000 · Oct 19, 2018 · a85af2c · a85af2c
1 parent a7a93f0
commit a85af2c
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 23 deletions.
diff --git a/ft.cpp b/ft.cpp
@@ -693,20 +693,11 @@ static void FreeTypeDrawBitmapPixelModeBGRA(FreeTypeGlyphInfo& FTGInfo, int x, i
 		for (i = left, dx = x; i < width; i += 4, ++dx) {
 			backColor = cachebufrowp[dx];
 			COLORREF last = 0xFFFFFFFF;
-			if (AAMode == 3 || AAMode == 5) {
-				// BGR
-				alphaR = p[i + 2];
-				alphaG = p[i + 1];
-				alphaB = p[i + 0];
-				alpha = p[i + 3];
-			}
-			else {
-				// RGB
-				alphaR = p[i + 0];
-				alphaG = p[i + 1];
-				alphaB = p[i + 2];
-				alpha = p[i + 3];
-			}
+			// always RGB
+			alphaR = p[i + 0];
+			alphaG = p[i + 1];
+			alphaB = p[i + 2];
+			alpha = p[i + 3];
 			newColor = mixer(backColor, alphaB, alphaG, alphaR, alpha);
 			cachebufrowp[dx] = newColor;
 		}

diff --git a/gdidll.rc b/gdidll.rc
@@ -12,7 +12,7 @@
 #undef APSTUDIO_READONLY_SYMBOLS
 
 /////////////////////////////////////////////////////////////////////////////
-// ���ض�����(ϵͳĬ��ֵ) resources
+// Neutral (Sys. Default) resources
 
 #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_NEUSD)
 LANGUAGE LANG_NEUTRAL, SUBLANG_SYS_DEFAULT
@@ -24,8 +24,8 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_SYS_DEFAULT
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,2018,719,0
- PRODUCTVERSION 1,2018,719,0
+ FILEVERSION 1,2018,1019,0
+ PRODUCTVERSION 1,2018,1019,0
  FILEFLAGSMASK 0x8L
 #ifdef _DEBUG
  FILEFLAGS 0xbL
@@ -43,14 +43,14 @@ BEGIN
             VALUE "Comments", "Portions of this software are copyright (c) 2005-2017 The FreeType Project (www.freetype.org). All rights reserved."
             VALUE "CompanyName", "2ch & THEMEX"
             VALUE "FileDescription", "The Ultimate Font Rasterizer with Infinality patch"
-            VALUE "FileVersion", "1.2018.719.0"
+            VALUE "FileVersion", "1.2018.1019.0"
             VALUE "InternalName", "MacType"
             VALUE "LegalCopyright", "(C) 460, 168, Higambana, 555 and sy567. All rights reserved. FlyingSnow republished"
             VALUE "OriginalFilename", "MacType.dll"
             VALUE "PrivateBuild", "True"
             VALUE "ProductName", "The Ultimate Font Rasterizer"
-            VALUE "ProductVersion", "1.2018.719.0"
-            VALUE "URL", "http://mactype.themex.net http://drwatson.nobody.jp/gdi++/"
+            VALUE "ProductVersion", "1.2018.1019.0"
+            VALUE "URL", "http://www.mactype.net http://drwatson.nobody.jp/gdi++/"
         END
     END
     BLOCK "VarFileInfo"
@@ -59,12 +59,12 @@ BEGIN
     END
 END
 
-#endif    // ���ض�����(ϵͳĬ��ֵ) resources
+#endif    // Neutral (Sys. Default) resources
 /////////////////////////////////////////////////////////////////////////////
 
 
 /////////////////////////////////////////////////////////////////////////////
-// ����(���壬�й�) resources
+// Chinese (Simplified, PRC) resources
 
 #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_CHS)
 LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED
@@ -93,7 +93,7 @@ END
 
 #endif    // APSTUDIO_INVOKED
 
-#endif    // ����(���壬�й�) resources
+#endif    // Chinese (Simplified, PRC) resources
 /////////////////////////////////////////////////////////////////////////////