diff --git a/Ascii85ConsoleSolution.sln b/Ascii85ConsoleSolution.sln index 00aa57d..dbf26b3 100644 --- a/Ascii85ConsoleSolution.sln +++ b/Ascii85ConsoleSolution.sln @@ -1,21 +1,21 @@ -Microsoft Visual Studio Solution File, Format Version 8.00 +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 14 +VisualStudioVersion = 14.0.25420.1 +MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ascii85ConsoleSolution", "Ascii85ConsoleSolution\Ascii85ConsoleSolution.csproj", "{4C399EE9-78B2-43FC-8C12-2C40D506D05D}" - ProjectSection(ProjectDependencies) = postProject - EndProjectSection EndProject Global - GlobalSection(SolutionConfiguration) = preSolution - Debug = Debug - Release = Release + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU EndGlobalSection - GlobalSection(ProjectConfiguration) = postSolution - {4C399EE9-78B2-43FC-8C12-2C40D506D05D}.Debug.ActiveCfg = Debug|.NET - {4C399EE9-78B2-43FC-8C12-2C40D506D05D}.Debug.Build.0 = Debug|.NET - {4C399EE9-78B2-43FC-8C12-2C40D506D05D}.Release.ActiveCfg = Release|.NET - {4C399EE9-78B2-43FC-8C12-2C40D506D05D}.Release.Build.0 = Release|.NET + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {4C399EE9-78B2-43FC-8C12-2C40D506D05D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {4C399EE9-78B2-43FC-8C12-2C40D506D05D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {4C399EE9-78B2-43FC-8C12-2C40D506D05D}.Release|Any CPU.ActiveCfg = Release|Any CPU + {4C399EE9-78B2-43FC-8C12-2C40D506D05D}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - EndGlobalSection - GlobalSection(ExtensibilityAddIns) = postSolution + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE EndGlobalSection EndGlobal diff --git a/Ascii85ConsoleSolution/Ascii85.cs b/Ascii85ConsoleSolution/Ascii85.cs index 15bb415..2f2f639 100644 --- a/Ascii85ConsoleSolution/Ascii85.cs +++ b/Ascii85ConsoleSolution/Ascii85.cs @@ -64,6 +64,8 @@ public byte[] Decode(string s) s = s.Substring(0, s.Length - SuffixMark.Length); } + _tuple = 0; + MemoryStream ms = new MemoryStream(); int count = 0; bool processChar = false; diff --git a/Ascii85ConsoleSolution/Ascii85ConsoleSolution.csproj b/Ascii85ConsoleSolution/Ascii85ConsoleSolution.csproj index b8c612b..2135771 100644 --- a/Ascii85ConsoleSolution/Ascii85ConsoleSolution.csproj +++ b/Ascii85ConsoleSolution/Ascii85ConsoleSolution.csproj @@ -1,95 +1,90 @@ - - - - - - - - - - - - - - - - - - - - - + + + + Local + 7.10.3077 + 2.0 + {4C399EE9-78B2-43FC-8C12-2C40D506D05D} + Debug + AnyCPU + + + Ascii85ConsoleSolution + + JScript + Grid + IE50 + false + Exe + Ascii85ConsoleSolution + OnBuildSuccess + + + + v2.0 + + + 0.0 + + + bin\Debug\ + false + 285212672 + false + + DEBUG;TRACE + + true + 4096 + false + + false + false + false + false + 4 + full + prompt + + + bin\Release\ + false + 285212672 + false + + TRACE + + false + 4096 + false + + true + false + false + false + 4 + none + prompt + + + + System + + + System.Data + + + + + Code + + + Code + + + + + + + + \ No newline at end of file diff --git a/Ascii85ConsoleSolution/Class1.cs b/Ascii85ConsoleSolution/Class1.cs index 953e10d..ddbdb15 100644 --- a/Ascii85ConsoleSolution/Class1.cs +++ b/Ascii85ConsoleSolution/Class1.cs @@ -87,5 +87,12 @@ static void TestString() Console.WriteLine(); Console.WriteLine("Decoded " + decoded.Length + " chars"); Console.WriteLine(); - } + + byte[] decoded2 = a.Decode(encoded); + Console.WriteLine(Encoding.ASCII.GetString(decoded2)); + + Console.WriteLine("Equal results from multiple Decode calls?\t" + Encoding.ASCII.GetString(decoded) == Encoding.ASCII.GetString(decoded2)); + + Console.ReadKey(); + } } \ No newline at end of file