Skip to content
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

Jump to bottom

Zlib: update external library, introduces 'Deflate' #19748

Merged
merged 2 commits into from
Jun 30, 2020
+76 −22
Merged

Zlib: update external library, introduces 'Deflate' #19748

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
787ffe5
Zlib: update external library, introduces 'Deflate'
sciecode Jun 28, 2020
05a1f68
Zlib: constructor variable non-modular fix.
sciecode Jun 28, 2020
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
26 changes: 26 additions & 0 deletions examples/js/libs/deflate.min.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions examples/js/libs/inflate.min.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions examples/js/loaders/EXRLoader.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1280,13 +1280,13 @@ THREE.EXRLoader.prototype = Object.assign( Object.create( THREE.DataTextureLoade

var compressed = info.array.slice( info.offset.value, info.offset.value + info.size );

if ( typeof Zlib === 'undefined' ) {
if ( typeof Inflate === 'undefined' ) {

console.error( 'THREE.EXRLoader: External library Inflate.min.js required, obtain or import from https://github.com/imaya/zlib.js' );

}

var inflate = new Zlib.Inflate( compressed, { resize: true, verify: true } ); // eslint-disable-line no-undef
var inflate = new Inflate( compressed, { resize: true, verify: true } ); // eslint-disable-line no-undef

var rawBuffer = new Uint8Array( inflate.decompress().buffer );
var tmpBuffer = new Uint8Array( rawBuffer.length );
Expand Down Expand Up @@ -1514,7 +1514,7 @@ THREE.EXRLoader.prototype = Object.assign( Object.create( THREE.DataTextureLoade
case DEFLATE:

var compressed = info.array.slice( inOffset.value, inOffset.value + dwaHeader.totalAcUncompressedCount );
var inflate = new Zlib.Inflate( compressed, { resize: true, verify: true } );
var inflate = new Inflate( compressed, { resize: true, verify: true } );
var acBuffer = new Uint16Array( inflate.decompress().buffer );
inOffset.value += dwaHeader.totalAcUncompressedCount;
break;
Expand All @@ -1541,7 +1541,7 @@ THREE.EXRLoader.prototype = Object.assign( Object.create( THREE.DataTextureLoade
if ( dwaHeader.rleRawSize > 0 ) {

var compressed = info.array.slice( inOffset.value, inOffset.value + dwaHeader.rleCompressedSize );
var inflate = new Zlib.Inflate( compressed, { resize: true, verify: true } );
var inflate = new Inflate( compressed, { resize: true, verify: true } );
var rleBuffer = decodeRunLength( inflate.decompress().buffer );

inOffset.value += dwaHeader.rleCompressedSize;
Expand Down
4 changes: 2 additions & 2 deletions examples/js/loaders/FBXLoader.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3539,13 +3539,13 @@ THREE.FBXLoader = ( function () {

}

if ( typeof Zlib === 'undefined' ) {
if ( typeof Inflate === 'undefined' ) {

console.error( 'THREE.FBXLoader: External library Inflate.min.js required, obtain or import from https://github.com/imaya/zlib.js' );

}

var inflate = new Zlib.Inflate( new Uint8Array( reader.getArrayBuffer( compressedLength ) ) ); // eslint-disable-line no-undef
var inflate = new Inflate( new Uint8Array( reader.getArrayBuffer( compressedLength ) ) ); // eslint-disable-line no-undef
var reader2 = new BinaryReader( inflate.decompress().buffer );

switch ( type ) {
Expand Down
2 changes: 1 addition & 1 deletion examples/js/loaders/VTKLoader.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -795,7 +795,7 @@ THREE.VTKLoader.prototype = Object.assign( Object.create( THREE.Loader.prototype

for ( var i = 0; i < dataOffsets.length - 1; i ++ ) {

var inflate = new Zlib.Inflate( byteData.slice( dataOffsets[ i ], dataOffsets[ i + 1 ] ), { resize: true, verify: true } ); // eslint-disable-line no-undef
var inflate = new Inflate( byteData.slice( dataOffsets[ i ], dataOffsets[ i + 1 ] ), { resize: true, verify: true } ); // eslint-disable-line no-undef
content = inflate.decompress();
content = content.buffer;

Expand Down
Loading