--- trunk/gr2lib/core/coreclasses/header/granny_file.cs	2010/07/17 05:09:42	94
+++ trunk/gr2lib/core/coreclasses/header/granny_file.cs	2010/07/17 13:54:18	102
@@ -46,19 +46,6 @@ namespace gr2lib.core.header
             coreapi.FreeFile(NativeFilePointer);
         }
 
-
-        //internal static granny_file ReadFromMemory(IntPtr pointer)
-        //{
-        //    if (pointer == IntPtr.Zero) return null;
-        //    gr2lib.core.coretypes.native.granny_file native = Helpers.ReadFromMemory<gr2lib.core.coretypes.native.granny_file>(pointer);
-        //    granny_file managed = new granny_file();
-        //    managed.NativePointer = pointer;
-
-        //    // process
-           
-
-        //    return managed;
-        //}
         internal static void ReadFromMemory(string filename, ref granny_file grn_file)
         {
             //if (grn_file.NativePointer == IntPtr.Zero) return;
@@ -68,6 +55,7 @@ namespace gr2lib.core.header
 
             // process
 
+            
             managed.IsByteReversed = native.IsByteReversed;
             managed.SectionCount = native.SectionCount;
             managed.Sections = native.Sections;
@@ -101,19 +89,7 @@ namespace gr2lib.core.header
             grn_file = managed;
         }
 
-        //public static void ReadFromFile(string filename, out granny_file grn_file)
-        //{
-        //    grn_file = new granny_file();
-        //    grn_file.NativePointer = coreapi.GrannyReadEntireFile(filename);
-        //    if (grn_file.NativePointer == null || grn_file.NativePointer == IntPtr.Zero)
-        //    {
-        //        Console.WriteLine("Error: unable to load {0} as a Granny file.", filename);
-        //    }
-
-        //    grn_file.NativeFilePointer = coreapi.GetFileInfo(grn_file.NativePointer);
-        //    ReadFromMemory(out grn_file);
-        //    coreapi.FreeFile(grn_file.NativePointer);
-        //}
+
 
         public static granny_file ReadFromFile(string filename)
         {
@@ -159,6 +135,10 @@ namespace gr2lib.core.header
         public bool Marshalled { get { return _Marshalled; } set { _Marshalled = value; } }
         public bool IsUserMemory { get { return _IsUserMemory; } set { _IsUserMemory = value; } }
         public IntPtr ConversionBuffer { get { return _ConversionBuffer; } set { _ConversionBuffer = value; } }
+
+
+        public bool HaveHeader { get { if (Header == null) return false; return true; } }
+        public bool HaveMagic { get { if (SourceMagicValue == null) return false; return true; } }
         #endregion
     }
 }