paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-17 22:09:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

* fixed compilation of unit graph for win32 and win64 after r25730

Browse Source 
git-svn-id: trunk@25734 -
This commit is contained in:
nickysn 2013-10-10 09:06:13 +00:00
parent b1b8cc2542
commit 849843fb20
1 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
packages/graph/src/win32/graph.pp
View File

@ -319,6 +319,7 @@ procedure OutTextXYWin32GUI(x,y : smallint;const TextString : string);
curX2, curY2, xpos2, ypos2, x2, y2: graph_float; curX2, curY2, xpos2, ypos2, x2, y2: graph_float;
oldvalues : linesettingstype; oldvalues : linesettingstype;
fontbitmap : TBitmapChar; fontbitmap : TBitmapChar;
fontbitmapbyte: byte;
chr : char; chr : char;
curx2i,cury2i, curx2i,cury2i,
xpos2i,ypos2i : longint; xpos2i,ypos2i : longint;
@ -397,11 +398,17 @@ procedure OutTextXYWin32GUI(x,y : smallint;const TextString : string);
Fontbitmap:=TBitmapChar(DefaultFontData[textstring[i+1]]); Fontbitmap:=TBitmapChar(DefaultFontData[textstring[i+1]]);
for j:=0 to 7 do for j:=0 to 7 do
for k:=0 to 7 do begin
if Fontbitmap[j,k]<>0 then fontbitmapbyte:=Fontbitmap[j];
SetPixelV(chardc,k,j,$ffffff) for k:=0 to 7 do
else begin
SetPixelV(chardc,k,j,0); if (fontbitmapbyte and $80)<>0 then
SetPixelV(chardc,k,j,$ffffff)
else
SetPixelV(chardc,k,j,0);
fontbitmapbyte:=fontbitmapbyte shl 1;
end;
end;
bitmapfonthorizoncache[byte(textstring[i+1])]:=charbitmap; bitmapfonthorizoncache[byte(textstring[i+1])]:=charbitmap;
SelectObject(chardc,oldcharbitmap); SelectObject(chardc,oldcharbitmap);
end; end;
@ -548,11 +555,17 @@ procedure OutTextXYWin32GUI(x,y : smallint;const TextString : string);
Fontbitmap:=TBitmapChar(DefaultFontData[textstring[i+1]]); Fontbitmap:=TBitmapChar(DefaultFontData[textstring[i+1]]);
for j:=0 to 7 do for j:=0 to 7 do
for k:=0 to 7 do begin
if Fontbitmap[j,k]<>0 then fontbitmapbyte:=Fontbitmap[j];
SetPixelV(chardc,j,7-k,$ffffff) for k:=0 to 7 do
else begin
SetPixelV(chardc,j,7-k,0); if (fontbitmapbyte and $80)<>0 then
SetPixelV(chardc,j,7-k,$ffffff)
else
SetPixelV(chardc,j,7-k,0);
fontbitmapbyte:=fontbitmapbyte shl 1;
end;
end;
bitmapfontverticalcache[byte(textstring[i+1])]:=charbitmap; bitmapfontverticalcache[byte(textstring[i+1])]:=charbitmap;
SelectObject(chardc,oldcharbitmap); SelectObject(chardc,oldcharbitmap);
end; end;