From 4a845d002e5b23379dbde9923625f6443f2942ac Mon Sep 17 00:00:00 2001 From: Marc Hernandez Date: Fri, 1 Jul 2022 16:19:43 -0700 Subject: [PATCH] Update --- ar/PpmCompress.cs | 3 ++- ar/PpmDecompress.cs | 3 ++- res/Resource.cs | 15 +++++++++------ 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/ar/PpmCompress.cs b/ar/PpmCompress.cs index d54929a..dcd401d 100644 --- a/ar/PpmCompress.cs +++ b/ar/PpmCompress.cs @@ -120,7 +120,8 @@ public sealed class PpmCompress enc.write(ctx.frequencies, 256); outerContinue:; } - outerBreak: + + //outerBreak: // Logic for order = -1 enc.write(model.orderMinus1Freqs, symbol); } diff --git a/ar/PpmDecompress.cs b/ar/PpmDecompress.cs index 68f4034..79f36c8 100644 --- a/ar/PpmDecompress.cs +++ b/ar/PpmDecompress.cs @@ -113,7 +113,8 @@ public sealed class PpmDecompress // Else we read the context escape symbol, so continue decrementing the order outerContinue:; } - outerBreak: + + //outerBreak: // Logic for order = -1 return dec.read(model.orderMinus1Freqs); } diff --git a/res/Resource.cs b/res/Resource.cs index 634d66e..a32cea8 100644 --- a/res/Resource.cs +++ b/res/Resource.cs @@ -47,7 +47,7 @@ namespace res } - private string m_filename; + protected string m_filename; } [Serializable] @@ -68,19 +68,22 @@ namespace res { } + /* public Ref( string filename, T res ) : base( filename ) { m_res = res; } - + */ override internal void load() { m_res = Mgr.load( filename ); } + [NonSerialized] private T m_res; + } @@ -118,13 +121,13 @@ namespace res class LoadHolder : LoadHolder { - public LoadHolder( Load _dlgtLoad ) + public LoadHolder( Load fnLoad ) { - dlgtLoad = _dlgtLoad; + m_fnLoad = fnLoad; } - public Load dlgtLoad; + public Load m_fnLoad; internal override object load() { @@ -282,7 +285,7 @@ namespace res { var loader = loaderGen as LoadHolder; - var v = loader.dlgtLoad( filename ); + var v = loader.m_fnLoad( filename ); var weak = new WeakReference( v );