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

--- Merging r30987 into '.':

Browse Source 
U    packages/chm/src/chmsitemap.pas
U    packages/chm/src/chmwriter.pas
U    packages/chm/src/chmfilewriter.pas
--- Recording mergeinfo for merge of r30987 into '.':
 U   .

# revisions: 30987

git-svn-id: branches/fixes_3_0@31083 -
This commit is contained in:
marco 2015-06-17 11:25:05 +00:00
parent 3605c0655a
commit bc4bae3150
3 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/chm/src/chmfilewriter.pas
View File

@ -1144,11 +1144,13 @@ begin
begin
if fileexists(FTableOfContentsFileName) then
begin
FreeAndNil(FTocStream);
FTocStream:=TMemoryStream.Create;
try
FTocStream.loadfromfile(FTableOfContentsFilename);
writeln(ftableofcontentsfilename, ' ' ,ftocstream.size);
//writeln(ftableofcontentsfilename, ' ' ,ftocstream.size);
FTocStream.Position:=0;
FreeAndNil(FToc);
FToc:=TChmSiteMap.Create(sttoc);
FToc.loadfromstream(FTocStream);
ftoc.savetofile('bla.something');
@ -1167,10 +1169,12 @@ begin
begin
if fileexists(FIndexFileName) then
begin
FreeAndNil(FIndexStream);
FIndexStream:=TMemoryStream.Create;
try
FIndexStream.LoadFromFile(FIndexFileName);
FIndexStream.Position:=0;
FreeAndNil(FIndex);
FIndex:=TChmSiteMap.Create(stindex);
FIndex.loadfromfile(FIndexFileName);
except

23
packages/chm/src/chmsitemap.pas
View File

@ -351,15 +351,22 @@ var
begin
if Assigned(FHTMLParser) then FHTMLParser.Free;
TmpStream := TMemoryStream.Create;
TmpStream.LoadFromFile(AFileName);
SetLength(Buffer, TmpStream.Size);
TmpStream.Position := 0;
TmpStream.Read(Buffer[1], TmpStream.Size);
try
TmpStream.LoadFromFile(AFileName);
SetLength(Buffer, TmpStream.Size);
TmpStream.Position := 0;
TmpStream.Read(Buffer[1], TmpStream.Size);
finally
TmpStream.Free;
end;
FHTMLParser := THTMLParser.Create(Buffer);
FHTMLParser.OnFoundTag := @FoundTag;
FHTMLParser.OnFoundText := @FoundText;
FHTMLParser.Exec;
FreeAndNil(FHTMLParser);
try
FHTMLParser.OnFoundTag := @FoundTag;
FHTMLParser.OnFoundText := @FoundText;
FHTMLParser.Exec;
finally
FreeAndNil(FHTMLParser);
end;
end;
procedure TChmSiteMap.LoadFromStream(AStream: TStream);

2
packages/chm/src/chmwriter.pas
View File

@ -1533,7 +1533,7 @@ begin
FURLSTRStream.Free;
FURLTBLStream.Free;
FFiftiMainStream.Free;
FIDXHdrStream.Create;
FIDXHdrStream.Free;
SpareString.free;
SpareUrlStr.free;
FAvlUrlStr.FreeAndClear;