|
@@ -134,8 +134,7 @@
|
|
if ( i != 0 ) for ( var j = 0; j < len; j ++ ) prev[ j ] = img[ j ];
|
|
if ( i != 0 ) for ( var j = 0; j < len; j ++ ) prev[ j ] = img[ j ];
|
|
if ( frm.blend == 0 ) UPNG._copyTile( fdata, fw, fh, img, w, h, fx, fy, 0 ); else if ( frm.blend == 1 ) UPNG._copyTile( fdata, fw, fh, img, w, h, fx, fy, 1 );
|
|
if ( frm.blend == 0 ) UPNG._copyTile( fdata, fw, fh, img, w, h, fx, fy, 0 ); else if ( frm.blend == 1 ) UPNG._copyTile( fdata, fw, fh, img, w, h, fx, fy, 1 );
|
|
frms.push( img.buffer.slice( 0 ) );
|
|
frms.push( img.buffer.slice( 0 ) );
|
|
-
|
|
|
|
- if ( frm.dispose == 0 ) {} else if ( frm.dispose == 1 ) UPNG._copyTile( empty, fw, fh, img, w, h, fx, fy, 0 ); else if ( frm.dispose == 2 ) for ( var j = 0; j < len; j ++ ) img[ j ] = prev[ j ];
|
|
|
|
|
|
+ if ( frm.dispose == 1 ) UPNG._copyTile( empty, fw, fh, img, w, h, fx, fy, 0 ); else if ( frm.dispose == 2 ) for ( var j = 0; j < len; j ++ ) img[ j ] = prev[ j ];
|
|
|
|
|
|
}
|
|
}
|
|
|
|
|
|
@@ -391,6 +390,7 @@
|
|
var fd,
|
|
var fd,
|
|
foff = 0; // frames
|
|
foff = 0; // frames
|
|
|
|
|
|
|
|
+ var text, keyw, bfr;
|
|
var mgck = [ 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a ];
|
|
var mgck = [ 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a ];
|
|
|
|
|
|
for ( var i = 0; i < 8; i ++ ) if ( data[ i ] != mgck[ i ] ) throw new Error( 'The input is not a PNG file!' );
|
|
for ( var i = 0; i < 8; i ++ ) if ( data[ i ] != mgck[ i ] ) throw new Error( 'The input is not a PNG file!' );
|
|
@@ -471,13 +471,11 @@
|
|
|
|
|
|
if ( out.tabs[ type ] == null ) out.tabs[ type ] = {};
|
|
if ( out.tabs[ type ] == null ) out.tabs[ type ] = {};
|
|
var nz = bin.nextZero( data, offset );
|
|
var nz = bin.nextZero( data, offset );
|
|
- var keyw = bin.readASCII( data, offset, nz - offset );
|
|
|
|
- var text,
|
|
|
|
- tl = offset + len - nz - 1;
|
|
|
|
|
|
+ keyw = bin.readASCII( data, offset, nz - offset );
|
|
|
|
+ var tl = offset + len - nz - 1;
|
|
if ( type == 'tEXt' ) text = bin.readASCII( data, nz + 1, tl ); else {
|
|
if ( type == 'tEXt' ) text = bin.readASCII( data, nz + 1, tl ); else {
|
|
|
|
|
|
- var bfr = UPNG.decode._inflate( data.slice( nz + 2, nz + 2 + tl ) );
|
|
|
|
-
|
|
|
|
|
|
+ bfr = UPNG.decode._inflate( data.slice( nz + 2, nz + 2 + tl ) );
|
|
text = bin.readUTF8( bfr, 0, bfr.length );
|
|
text = bin.readUTF8( bfr, 0, bfr.length );
|
|
|
|
|
|
}
|
|
}
|
|
@@ -490,7 +488,7 @@
|
|
var nz = 0,
|
|
var nz = 0,
|
|
off = offset;
|
|
off = offset;
|
|
nz = bin.nextZero( data, off );
|
|
nz = bin.nextZero( data, off );
|
|
- var keyw = bin.readASCII( data, off, nz - off );
|
|
|
|
|
|
+ keyw = bin.readASCII( data, off, nz - off );
|
|
off = nz + 1;
|
|
off = nz + 1;
|
|
var cflag = data[ off ];
|
|
var cflag = data[ off ];
|
|
off += 2;
|
|
off += 2;
|
|
@@ -500,12 +498,10 @@
|
|
nz = bin.nextZero( data, off );
|
|
nz = bin.nextZero( data, off );
|
|
bin.readUTF8( data, off, nz - off );
|
|
bin.readUTF8( data, off, nz - off );
|
|
off = nz + 1;
|
|
off = nz + 1;
|
|
- var text,
|
|
|
|
- tl = len - ( off - offset );
|
|
|
|
|
|
+ var tl = len - ( off - offset );
|
|
if ( cflag == 0 ) text = bin.readUTF8( data, off, tl ); else {
|
|
if ( cflag == 0 ) text = bin.readUTF8( data, off, tl ); else {
|
|
|
|
|
|
- var bfr = UPNG.decode._inflate( data.slice( off, off + tl ) );
|
|
|
|
-
|
|
|
|
|
|
+ bfr = UPNG.decode._inflate( data.slice( off, off + tl ) );
|
|
text = bin.readUTF8( bfr, 0, bfr.length );
|
|
text = bin.readUTF8( bfr, 0, bfr.length );
|
|
|
|
|
|
}
|
|
}
|
|
@@ -1087,6 +1083,7 @@
|
|
|
|
|
|
var y = 0,
|
|
var y = 0,
|
|
row = starting_row[ pass ];
|
|
row = starting_row[ pass ];
|
|
|
|
+ var val;
|
|
|
|
|
|
while ( row < h ) {
|
|
while ( row < h ) {
|
|
|
|
|
|
@@ -1097,7 +1094,7 @@
|
|
|
|
|
|
if ( bpp == 1 ) {
|
|
if ( bpp == 1 ) {
|
|
|
|
|
|
- var val = data[ cdi >> 3 ];
|
|
|
|
|
|
+ val = data[ cdi >> 3 ];
|
|
val = val >> 7 - ( cdi & 7 ) & 1;
|
|
val = val >> 7 - ( cdi & 7 ) & 1;
|
|
img[ row * bpl + ( col >> 3 ) ] |= val << 7 - ( ( col & 7 ) << 0 );
|
|
img[ row * bpl + ( col >> 3 ) ] |= val << 7 - ( ( col & 7 ) << 0 );
|
|
|
|
|
|
@@ -1105,7 +1102,7 @@
|
|
|
|
|
|
if ( bpp == 2 ) {
|
|
if ( bpp == 2 ) {
|
|
|
|
|
|
- var val = data[ cdi >> 3 ];
|
|
|
|
|
|
+ val = data[ cdi >> 3 ];
|
|
val = val >> 6 - ( cdi & 7 ) & 3;
|
|
val = val >> 6 - ( cdi & 7 ) & 3;
|
|
img[ row * bpl + ( col >> 2 ) ] |= val << 6 - ( ( col & 3 ) << 1 );
|
|
img[ row * bpl + ( col >> 2 ) ] |= val << 6 - ( ( col & 3 ) << 1 );
|
|
|
|
|
|
@@ -1113,7 +1110,7 @@
|
|
|
|
|
|
if ( bpp == 4 ) {
|
|
if ( bpp == 4 ) {
|
|
|
|
|
|
- var val = data[ cdi >> 3 ];
|
|
|
|
|
|
+ val = data[ cdi >> 3 ];
|
|
val = val >> 4 - ( cdi & 7 ) & 15;
|
|
val = val >> 4 - ( cdi & 7 ) & 15;
|
|
img[ row * bpl + ( col >> 1 ) ] |= val << 4 - ( ( col & 1 ) << 2 );
|
|
img[ row * bpl + ( col >> 1 ) ] |= val << 4 - ( ( col & 1 ) << 2 );
|
|
|
|
|