Skip to content

Merge #69, #84, and #133 #20

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

Merged
McNeight merged 8 commits into from
Aug 15, 2016
Merged

Merge #69, #84, and #133 #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
bd227bb
Fixed objectdisposedexception
Ezghoul Feb 7, 2015
369e1b7
since the stream is not seek-able, access to Length should return exc…
kkguo Jul 15, 2015
c957965
PendingBuffer ToByteArray() to return all bytes
charlesgriffiths Aug 14, 2016
d819c9e
Merge pull request #133 from charlesgriffiths/patch-1
McNeight Aug 14, 2016
d6ef5d7
Merge branch 'master' of https://github.com/Ezghoul/SharpZipLib into …
McNeight Aug 15, 2016
36dd161
Merge branch 'Ezghoul-master'
McNeight Aug 15, 2016
0b3fb4f
Merge branch 'master' of https://github.com/kkguo/SharpZipLib into pr84
McNeight Aug 15, 2016
41c14c5
Merge branch 'pr84'
McNeight Aug 15, 2016
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
174 changes: 95 additions & 79 deletions ICSharpCode.SharpZipLib/BZip2/BZip2OutputStream.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,8 @@ public BZip2OutputStream(Stream stream, int blockSize)
/// Get/set flag indicating ownership of underlying stream.
/// When the flag is true <see cref="Close"></see> will close the underlying stream also.
/// </summary>
public bool IsStreamOwner {
public bool IsStreamOwner
{
get { return isStreamOwner; }
set { isStreamOwner = value; }
}
Expand All @@ -104,47 +105,58 @@ public bool IsStreamOwner {
/// <summary>
/// Gets a value indicating whether the current stream supports reading
/// </summary>
public override bool CanRead {
get {
public override bool CanRead
{
get
{
return false;
}
}

/// <summary>
/// Gets a value indicating whether the current stream supports seeking
/// </summary>
public override bool CanSeek {
get {
public override bool CanSeek
{
get
{
return false;
}
}

/// <summary>
/// Gets a value indicating whether the current stream supports writing
/// </summary>
public override bool CanWrite {
get {
public override bool CanWrite
{
get
{
return baseStream.CanWrite;
}
}

/// <summary>
/// Gets the length in bytes of the stream
/// </summary>
public override long Length {
get {
public override long Length
{
get
{
return baseStream.Length;
}
}

/// <summary>
/// Gets or sets the current position of this stream.
/// </summary>
public override long Position {
get {
public override long Position
{
get
{
return baseStream.Position;
}
set {
set
{
throw new NotSupportedException("BZip2OutputStream position cannot be set");
}
}
Expand Down Expand Up @@ -282,37 +294,37 @@ void WriteRun()
}

switch (runLength) {
case 1:
last++;
block[last + 1] = (byte)currentChar;
break;
case 2:
last++;
block[last + 1] = (byte)currentChar;
last++;
block[last + 1] = (byte)currentChar;
break;
case 3:
last++;
block[last + 1] = (byte)currentChar;
last++;
block[last + 1] = (byte)currentChar;
last++;
block[last + 1] = (byte)currentChar;
break;
default:
inUse[runLength - 4] = true;
last++;
block[last + 1] = (byte)currentChar;
last++;
block[last + 1] = (byte)currentChar;
last++;
block[last + 1] = (byte)currentChar;
last++;
block[last + 1] = (byte)currentChar;
last++;
block[last + 1] = (byte)(runLength - 4);
break;
case 1:
last++;
block[last + 1] = (byte)currentChar;
break;
case 2:
last++;
block[last + 1] = (byte)currentChar;
last++;
block[last + 1] = (byte)currentChar;
break;
case 3:
last++;
block[last + 1] = (byte)currentChar;
last++;
block[last + 1] = (byte)currentChar;
last++;
block[last + 1] = (byte)currentChar;
break;
default:
inUse[runLength - 4] = true;
last++;
block[last + 1] = (byte)currentChar;
last++;
block[last + 1] = (byte)currentChar;
last++;
block[last + 1] = (byte)currentChar;
last++;
block[last + 1] = (byte)currentChar;
last++;
block[last + 1] = (byte)(runLength - 4);
break;
}
} else {
EndBlock();
Expand All @@ -324,7 +336,8 @@ void WriteRun()
/// <summary>
/// Get the number of bytes written to the output.
/// </summary>
public int BytesWritten {
public int BytesWritten
{
get { return bytesOut; }
}

Expand All @@ -335,25 +348,28 @@ public int BytesWritten {
override protected void Dispose(bool disposing)
{
try {
base.Dispose(disposing);
if (!disposed_) {
disposed_ = true;
try {
base.Dispose(disposing);
if (!disposed_) {
disposed_ = true;

if (runLength > 0) {
WriteRun();
}
if (runLength > 0) {
WriteRun();
}

currentChar = -1;
EndBlock();
EndCompression();
Flush();
}
} finally {
if (disposing) {
if (IsStreamOwner) {
baseStream.Close();
currentChar = -1;
EndBlock();
EndCompression();
Flush();
}
} finally {
if (disposing) {
if (IsStreamOwner) {
baseStream.Close();
}
}
}
} catch {
}
}

Expand Down Expand Up @@ -1495,16 +1511,16 @@ void GenerateMTFValues()
zPend--;
while (true) {
switch (zPend % 2) {
case 0:
szptr[wr] = (short)BZip2Constants.RunA;
wr++;
mtfFreq[BZip2Constants.RunA]++;
break;
case 1:
szptr[wr] = (short)BZip2Constants.RunB;
wr++;
mtfFreq[BZip2Constants.RunB]++;
break;
case 0:
szptr[wr] = (short)BZip2Constants.RunA;
wr++;
mtfFreq[BZip2Constants.RunA]++;
break;
case 1:
szptr[wr] = (short)BZip2Constants.RunB;
wr++;
mtfFreq[BZip2Constants.RunB]++;
break;
}
if (zPend < 2) {
break;
Expand All @@ -1523,16 +1539,16 @@ void GenerateMTFValues()
zPend--;
while (true) {
switch (zPend % 2) {
case 0:
szptr[wr] = (short)BZip2Constants.RunA;
wr++;
mtfFreq[BZip2Constants.RunA]++;
break;
case 1:
szptr[wr] = (short)BZip2Constants.RunB;
wr++;
mtfFreq[BZip2Constants.RunB]++;
break;
case 0:
szptr[wr] = (short)BZip2Constants.RunA;
wr++;
mtfFreq[BZip2Constants.RunA]++;
break;
case 1:
szptr[wr] = (short)BZip2Constants.RunB;
wr++;
mtfFreq[BZip2Constants.RunB]++;
break;
}
if (zPend < 2) {
break;
Expand Down
2 changes: 2 additions & 0 deletions ICSharpCode.SharpZipLib/Zip/Compression/PendingBuffer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,6 +245,8 @@ public int Flush(byte[] output, int offset, int length)
/// </returns>
public byte[] ToByteArray()
{
AlignToByte();

byte[] result = new byte[end - start];
System.Array.Copy(buffer_, start, result, 0, result.Length);
start = 0;
Expand Down
3 changes: 2 additions & 1 deletion ICSharpCode.SharpZipLib/Zip/Compression/Streams/InflaterInputStream.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -481,7 +481,8 @@ public override bool CanWrite {
/// </summary>
public override long Length {
get {
return inputBuffer.RawLength;
//return inputBuffer.RawLength;
throw new NotSupportedException("InflaterInputStream Length is not supported");
}
}

Expand Down