diff --git a/CSharp/Libraries/UniversalEditor.Core/Accessors/MemoryAccessor.cs b/CSharp/Libraries/UniversalEditor.Core/Accessors/MemoryAccessor.cs
index 63460825..9c94e51d 100644
--- a/CSharp/Libraries/UniversalEditor.Core/Accessors/MemoryAccessor.cs
+++ b/CSharp/Libraries/UniversalEditor.Core/Accessors/MemoryAccessor.cs
@@ -56,7 +56,7 @@ namespace UniversalEditor.Accessors
break;
}
}
- if (start >= 0 && start < _data.Length)
+ if (start >= 0 && start <= _data.Length)
{
ptr = start;
}
@@ -75,7 +75,8 @@ namespace UniversalEditor.Accessors
internal override int ReadInternal(byte[] buffer, int start, int count)
{
- System.Array.Copy(_data, 0, buffer, start, count);
+ System.Array.Copy(_data, Position, buffer, start, count);
+ Position += count;
return count;
}
internal override int WriteInternal(byte[] buffer, int start, int count)
diff --git a/CSharp/Libraries/UniversalEditor.Core/UniversalEditor.Core.csproj b/CSharp/Libraries/UniversalEditor.Core/UniversalEditor.Core.csproj
index 6ffeee03..1f5d4154 100644
--- a/CSharp/Libraries/UniversalEditor.Core/UniversalEditor.Core.csproj
+++ b/CSharp/Libraries/UniversalEditor.Core/UniversalEditor.Core.csproj
@@ -5,7 +5,7 @@
AnyCPU
8.0.30703
2.0
- {A92D520B-FFA3-4464-8CF6-474D18959E03}
+ {2D4737E6-6D95-408A-90DB-8DFF38147E85}
Library
Properties
UniversalEditor
diff --git a/CSharp/Plugins/UniversalEditor.Plugins.Multimedia/DataFormats/Multimedia/Picture/PortableNetworkGraphics/PNGDataFormat.cs b/CSharp/Plugins/UniversalEditor.Plugins.Multimedia/DataFormats/Multimedia/Picture/PortableNetworkGraphics/PNGDataFormat.cs
index ea8e3e5b..df241b7f 100644
--- a/CSharp/Plugins/UniversalEditor.Plugins.Multimedia/DataFormats/Multimedia/Picture/PortableNetworkGraphics/PNGDataFormat.cs
+++ b/CSharp/Plugins/UniversalEditor.Plugins.Multimedia/DataFormats/Multimedia/Picture/PortableNetworkGraphics/PNGDataFormat.cs
@@ -59,7 +59,7 @@ namespace UniversalEditor.DataFormats.Multimedia.Picture.PortableNetworkGraphics
compressionModule.ImageWidth = pic.Width;
compressionModule.ImageHeight = pic.Height;
compressionModule.Method = compressionMethod;
- compressionModule.BytesPerPixel = ((bitDepth / 8) * 3);
+ compressionModule.BytesPerPixel = (int)(((double)bitDepth / 8) * 3);
byte[] uncompressed = compressionModule.Decompress(uncompressedFilteredImageData);