Fixed a bug in chmfilewriter.pas where an uninitialized variable was used. I eliminated the variable.

git-svn-id: trunk@11995 -
This commit is contained in:
andrew 2008-10-30 01:43:54 +00:00
parent 1ed71f011c
commit ecef0ed86a

View File

@ -36,7 +36,6 @@ type
TChmProject = class
private
FWriter: TChmWriter;
FAutoFollowLinks: Boolean;
FDefaultFont: String;
FDefaultPage: String;
@ -86,7 +85,6 @@ begin
Result := False; // Return true to abort compressing files
TMemoryStream(Stream).LoadFromFile(ProjectDir+DataName);
WriteLn('Reading: ', DataName);
// clean up the filename
FileName := StringReplace(ExtractFileName(DataName), '\', '/', [rfReplaceAll]);
FileName := StringReplace(FileName, '//', '/', [rfReplaceAll]);
@ -99,16 +97,18 @@ procedure TChmProject.LastFileAdded(Sender: TObject);
var
IndexStream: TFileStream;
TOCStream: TFileStream;
Writer: TChmWriter;
begin
// Assign the TOC and index files
Writer := TChmWriter(Sender);
if (IndexFileName <> '') and FileExists(IndexFileName) then begin
IndexStream := TFileStream.Create(IndexFileName, fmOpenRead);
FWriter.AppendIndex(IndexStream);
Writer.AppendIndex(IndexStream);
IndexStream.Free;
end;
if (TableOfContentsFileName <> '') and FileExists(TableOfContentsFileName) then begin
TOCStream := TFileStream.Create(TableOfContentsFileName, fmOpenRead);
FWriter.AppendTOC(TOCStream);
Writer.AppendTOC(TOCStream);
TOCStream.Free;
end;
@ -194,6 +194,7 @@ begin
TOCStream := nil;
Writer := TChmWriter.Create(AOutStream, False);
// our callback to get data
Writer.OnGetFileData := @GetData;
Writer.OnLastFile := @LastFileAdded;