Skip to content

Avoid copying DWG object memory stream #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Michaelliv wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Avoid copying DWG object memory stream #3

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions src/IO/DWG/DwgStreamReaders/DwgObjectReader.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,7 +301,7 @@ export class DwgObjectReader extends DwgSectionIO {
}

this._memoryStream = new Uint8Array(reader.stream);
this._crcReader = DwgStreamReaderBase.getStreamHandler(this._version, new Uint8Array(this._memoryStream));
this._crcReader = DwgStreamReaderBase.getStreamHandler(this._version, this._memoryStream);
}

public read(): void {
Expand Down Expand Up @@ -354,24 +354,24 @@ export class DwgObjectReader extends DwgSectionIO {
const handleSize = this._crcReader.readModularChar();
const handleSectionOffset = this._crcReader.positionInBits() + sizeInBits - handleSize;

this._objectReader = DwgStreamReaderBase.getStreamHandler(this._version, new Uint8Array(this._memoryStream), this._reader.encoding);
this._objectReader = DwgStreamReaderBase.getStreamHandler(this._version, this._memoryStream, this._reader.encoding);
this._objectReader.setPositionInBits(this._crcReader.positionInBits());

this._objectInitialPos = this._objectReader.positionInBits();
type = this._objectReader.readObjectType();

this._handlesReader = DwgStreamReaderBase.getStreamHandler(this._version, new Uint8Array(this._memoryStream), this._reader.encoding);
this._handlesReader = DwgStreamReaderBase.getStreamHandler(this._version, this._memoryStream, this._reader.encoding);
this._handlesReader.setPositionInBits(handleSectionOffset);

this._textReader = DwgStreamReaderBase.getStreamHandler(this._version, new Uint8Array(this._memoryStream), this._reader.encoding);
this._textReader = DwgStreamReaderBase.getStreamHandler(this._version, this._memoryStream, this._reader.encoding);
this._textReader.setPositionByFlag(handleSectionOffset - 1);

this._mergedReaders = new DwgMergedReader(this._objectReader, this._textReader, this._handlesReader);
} else {
this._objectReader = DwgStreamReaderBase.getStreamHandler(this._version, new Uint8Array(this._memoryStream), this._reader.encoding);
this._objectReader = DwgStreamReaderBase.getStreamHandler(this._version, this._memoryStream, this._reader.encoding);
this._objectReader.setPositionInBits(this._crcReader.positionInBits());

this._handlesReader = DwgStreamReaderBase.getStreamHandler(this._version, new Uint8Array(this._memoryStream), this._reader.encoding);
this._handlesReader = DwgStreamReaderBase.getStreamHandler(this._version, this._memoryStream, this._reader.encoding);
this._textReader = this._objectReader;

this._objectInitialPos = this._objectReader.positionInBits();
Expand Down Expand Up @@ -644,7 +644,7 @@ export class DwgObjectReader extends DwgSectionIO {
this._handlesReader.setPositionInBits(size + this._objectInitialPos);

if (this._version === ACadVersion.AC1021) {
this._textReader = DwgStreamReaderBase.getStreamHandler(this._version, new Uint8Array(this._memoryStream), this._reader.encoding);
this._textReader = DwgStreamReaderBase.getStreamHandler(this._version, this._memoryStream, this._reader.encoding);
this._textReader.setPositionByFlag(size + this._objectInitialPos - 1);
}

Expand Down