hyzboy/ULRE
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed a bug that The number of pixels in a line of a character bitmap is incorrectly calculated

Browse Source
This commit is contained in:
HuYingzhuo(hugo/hyzboy) 2022-06-22 11:36:20 +08:00
parent 2a28872309
commit d7f0b1b5ec
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/SceneGraph/font/FontSourceWin.cpp
View File

@ -7,12 +7,14 @@ namespace hgl
{ {
namespace namespace
{ {
void Convert8BitGrey(uint8 *dst,int dst_w,uint8 *src,int src_w,int src_h,int src_line_bytes) void Convert8BitGrey(uint8 *dst,int dst_w,uint8 *src,int src_w,int src_h)
{ {
int pos; int pos;
uint8 *sp=src,*p; uint8 *sp=src,*p;
uint8 *tp; uint8 *tp;
const uint src_line_bytes=hgl_align<uint>(src_w,4); //每行字节是32位对齐，这个已测试正常
while(src_h--) while(src_h--)
{ {
pos=src_w; pos=src_w;
@ -32,12 +34,14 @@ namespace hgl
} }
} }
void ConvertBitmap(uint8 *dst,int dst_w,uint8 *src,int src_w,int src_h,int src_line_bytes) void ConvertBitmap(uint8 *dst,int dst_w,uint8 *src,int src_w,int src_h)
{ {
uint8 *sp=src,*p; uint8 *sp=src,*p;
uint8 *tp; uint8 *tp;
uint8 bit; uint8 bit;
const uint src_line_bytes=hgl_align<uint>(src_w>>3,4); //每行字节是32位对齐，这个未测试
while(src_h--) while(src_h--)
{ {
p=sp; p=sp;
@ -130,9 +134,9 @@ namespace hgl
bmp->data=hgl_zero_new<uint8>(bmp->metrics_info.w*bmp->metrics_info.h); bmp->data=hgl_zero_new<uint8>(bmp->metrics_info.w*bmp->metrics_info.h);
if(ggo==GGO_GRAY8_BITMAP) if(ggo==GGO_GRAY8_BITMAP)
Convert8BitGrey (bmp->data,bmp->metrics_info.w,buffer,gm.gmBlackBoxX,gm.gmBlackBoxY,size/gm.gmBlackBoxY); Convert8BitGrey (bmp->data,bmp->metrics_info.w,buffer,gm.gmBlackBoxX,gm.gmBlackBoxY);
else else
ConvertBitmap (bmp->data,bmp->metrics_info.w,buffer,gm.gmBlackBoxX,gm.gmBlackBoxY,size/gm.gmBlackBoxY); ConvertBitmap (bmp->data,bmp->metrics_info.w,buffer,gm.gmBlackBoxX,gm.gmBlackBoxY);
return(true); return(true);
} }