Fixed Additional Bug Causing File to Cut Off

Daniel-McCarthy · Daniel-McCarthy · commit 37a3b97f01f1 · 2017-07-12T00:03:11.000-05:00
-Fixed a second bug within YAY0 and YAZ0 to cut off in certain
conditions. An improvement upon the previous fix.
diff --git a/PeepsCompress/PeepsCompress/Algorithm Classes/YAY0.cs b/PeepsCompress/PeepsCompress/Algorithm Classes/YAY0.cs
@@ -173,7 +173,7 @@ public byte[] buildYAY0CompressedBlock(ref List<byte> layoutBits, ref List<byte>
                 {
                     BitArray arrayOfBits = new BitArray(new byte[1] { layoutBytes[i] });
 
-                    for (int j = 7; ((j > -1) && (uncompressedData.Count > 0) && (compressedDataBytes.Count > 0)) ; j--)
+                    for (int j = 7; ((j > -1) && ((uncompressedData.Count > 0) || (compressedDataBytes.Count > 0))) ; j--)
                     {
                         if (arrayOfBits[j] == true)
                         {
diff --git a/PeepsCompress/PeepsCompress/Algorithm Classes/YAZ0.cs b/PeepsCompress/PeepsCompress/Algorithm Classes/YAZ0.cs
@@ -143,7 +143,7 @@ public byte[] buildYAZ0CompressedBlock(ref List<byte> layoutBits, ref List<byte>
 
                 BitArray arrayOfBits = new BitArray(new byte[1] { layoutBytes[i] });
 
-                for (int j = 7; ((j > -1) && (uncompressedData.Count > 0) && (compressedDataBytes.Count > 0)); j--)
+                for (int j = 7; ((j > -1) && ((uncompressedData.Count > 0) || (compressedDataBytes.Count > 0))); j--)
                 {
                     if(arrayOfBits[j] == true)
                     {

Original file line number	Diff line number	Diff line change
`@@ -173,7 +173,7 @@ public byte[] buildYAY0CompressedBlock(ref List<byte> layoutBits, ref List<byte>`
`173`	`173`	`{`
`174`	`174`	`BitArray arrayOfBits = new BitArray(new byte[1] { layoutBytes[i] });`
`175`	`175`
`176`		`- for (int j = 7; ((j > -1) && (uncompressedData.Count > 0) && (compressedDataBytes.Count > 0)) ; j--)`
	`176`	`+ for (int j = 7; ((j > -1) && ((uncompressedData.Count > 0) \|\| (compressedDataBytes.Count > 0))) ; j--)`
`177`	`177`	`{`
`178`	`178`	`if (arrayOfBits[j] == true)`
`179`	`179`	`{`
Original file line number	Diff line number	Diff line change
`@@ -143,7 +143,7 @@ public byte[] buildYAZ0CompressedBlock(ref List<byte> layoutBits, ref List<byte>`
`143`	`143`
`144`	`144`	`BitArray arrayOfBits = new BitArray(new byte[1] { layoutBytes[i] });`
`145`	`145`
`146`		`- for (int j = 7; ((j > -1) && (uncompressedData.Count > 0) && (compressedDataBytes.Count > 0)); j--)`
	`146`	`+ for (int j = 7; ((j > -1) && ((uncompressedData.Count > 0) \|\| (compressedDataBytes.Count > 0))); j--)`
`147`	`147`	`{`
`148`	`148`	`if(arrayOfBits[j] == true)`
`149`	`149`	`{`