Updated

data separation mechanism and image conversion codes have been changed.

Author: atiksoftware

.vs/Portable Viewer/FileContentIndex/0a9d45ba-ad8a-44ac-a622-209345f024b9.vsidx

@@ -16,8 +16,7 @@ public Form1() {
             InitializeComponent();
         }
 
-        private void Form1_Load(object sender, EventArgs e) { 
-            progressbar.Visible = false; 
+        private void Form1_Load(object sender, EventArgs e) {  
 
             this.AllowDrop = true;
             this.DragEnter += new DragEventHandler(Form1_DragEnter);
@@ -76,23 +75,13 @@ private void Open(string path) {
                     default:
                         throw new Exception("Not supported file format."); 
                 }
-                
-                progressbar.Visible = true; 
-                pm.Progress += (object sender, int progress) => { 
-                    progressbar.BeginInvoke((MethodInvoker)delegate() {
-                        progressbar.Value = progress;
-                    });
-                };
+                 
 
                 Thread t = new Thread(() => {
-                    pm.Parse(); 
+                    pm.Load(); 
                     picturebox.BeginInvoke((MethodInvoker)delegate() {
-                        picturebox.Image = pm.Image;
-                        progressbar.Visible = false;
-                        if(pm.comment != null)
-                            this.Text = pm.comment + " - " + appName;
-                        else
-                            this.Text = System.IO.Path.GetFileName(path) + " - " + appName;
+                        picturebox.Image = pm.Image; 
+                        this.Text = System.IO.Path.GetFileName(path) + " - " + appName;
                     });
                 });
 

.vs/Portable Viewer/FileContentIndex/1f45e6bb-781e-4d26-bfd2-1f1813f45f65.vsidx

@@ -2,56 +2,43 @@
 using System.Collections.Generic;
 using System.Text;
 using System.Drawing;
+using System.Drawing.Imaging;
 
 namespace Portable_Viewer {
     public class PBM : PM {
 
         public PBM(string path) : base(path) { }
 
-        override public void Parse() { 
-            magic = ReadToEndOfLine();
+        override public void Load() { 
+            magic = parser.ReadString();
             if(magic != "P1" && magic != "P4") throw new Exception("Not supported PBM format. Only P1 and P4 are supported.");
-            if(buffer[cursor] == '#') comment = ReadToEndOfLine();
 
-            string[] size = ReadToEndOfLine().Split(' ');
-            width = int.Parse(size[0]);
-            height = int.Parse(size[1]); 
-            
+            width = parser.ReadInt();
+            height = parser.ReadInt(); 
+
             switch (magic) {
                 case "P1":
-                    Parse_P1();
+                    values = parser.ReadBytesByInts(width * height );
                     break;
                 case "P4":
-                    Parse_P4();
+                    values = parser.ReadBytesByBits(width * height );
                     break;
-            }
-        }
+            } 
+ 
+            Image = new Bitmap(width, height, PixelFormat.Format24bppRgb);
 
-        void Parse_P1() {  
-            Image = new Bitmap(width, height);
-            int value = 0;
-            string[] values;
-            for (int y = 0; y < height; y++) {
-                values = ReadToEndOfLine().Split(' ');
-                for (int x = 0; x < width; x++) { 
-                    value = int.Parse(values[x]) == 0 ? 255 : 0;
-                    Image.SetPixel(x, y, Color.FromArgb(value, value, value)); 
-                }
-                OnProgressChanged((int)(100.0 * y / height));
+            BitmapData bitmapData = Image.LockBits(new Rectangle(0, 0, width, height), ImageLockMode.WriteOnly, Image.PixelFormat);
+            IntPtr ptr = bitmapData.Scan0;
+            byte value = 0;
+            for (int i = 0; i < values.Length; i++) {
+                value = values[i] == 0 ? (byte)255 : (byte)0;
+                System.Runtime.InteropServices.Marshal.WriteByte(ptr, i * 3 + 0, value);
+                System.Runtime.InteropServices.Marshal.WriteByte(ptr, i * 3 + 1, value);
+                System.Runtime.InteropServices.Marshal.WriteByte(ptr, i * 3 + 2, value); 
             }
-        }
 
-        void Parse_P4() {  
-            Image = new Bitmap(width, height);
-            int value = 0;
-            for (int y = 0; y < height; y++) {
-                for (int x = 0; x < width; x++) { 
-                    value = (buffer[cursor] & (1 << (7 - x % 8))) == 0 ? 255 : 0;
-                    Image.SetPixel(x, y, Color.FromArgb(value, value, value)); 
-                    if(x % 8 == 7) cursor++;
-                }
-                OnProgressChanged((int)(100.0 * y / height));
-            }
-        }
+            Image.UnlockBits(bitmapData);
+            
+        }   
     }
 }

.vs/Portable Viewer/FileContentIndex/24a00b43-9385-426e-a59e-ccca0f1cbe53.vsidx

@@ -1,58 +1,46 @@
 using System;
 using System.Collections.Generic;
 using System.Drawing;
+using System.Drawing.Imaging;
 using System.Text;
 
 namespace Portable_Viewer {
     public class PGM : PM {  
 
         public PGM(string path) : base(path) { }
-
-        override public void Parse() { 
-            magic = ReadToEndOfLine();
+ 
+        override public void Load() { 
+            magic = parser.ReadString();
             if(magic != "P2" && magic != "P5") throw new Exception("Not supported PGM format. Only P2 and P5 are supported.");
-            if(buffer[cursor] == '#') comment = ReadToEndOfLine();
 
-            string[] size = ReadToEndOfLine().Split(' ');
-            width = int.Parse(size[0]);
-            height = int.Parse(size[1]);
+            width = parser.ReadInt();
+            height = parser.ReadInt();
+            maxval = parser.ReadInt();
 
-            maxval = int.Parse(ReadToEndOfLine());
-            
             switch (magic) {
                 case "P2":
-                    Parse_P2();
+                    values = parser.ReadBytesByInts(width * height);
                     break;
                 case "P5":
-                    Parse_P5();
+                    values = parser.ReadBytes(width * height);
                     break;
             }
-        }
+            
+            if(maxval != 255) Normalize();
+ 
+            Image = new Bitmap(width, height, PixelFormat.Format24bppRgb);
 
-        void Parse_P2() {  
-            Image = new Bitmap(width, height);
-            int value = 0;
-            string[] values;
-            for (int y = 0; y < height; y++) {
-                values = ReadToEndOfLine().Split(' ');
-                for (int x = 0; x < width; x++) { 
-                    value = (int)(int.Parse(values[x]) * 255.0 / maxval);
-                     Image.SetPixel(x, y, Color.FromArgb(value, value, value)); 
-                }
-                OnProgressChanged((int)(100.0 * y / height));
-            }
-        }
+            BitmapData bitmapData = Image.LockBits(new Rectangle(0, 0, width, height), ImageLockMode.WriteOnly, Image.PixelFormat);
+            IntPtr ptr = bitmapData.Scan0;
 
-        void Parse_P5() {  
-            Image = new Bitmap(width, height);
-            int value = 0;
-            for (int y = 0; y < height; y++) {
-                for (int x = 0; x < width; x++) { 
-                    value = (int)(buffer[cursor++] * 255.0 / maxval);
-                    Image.SetPixel(x, y, Color.FromArgb(value, value, value)); 
-                }
-                OnProgressChanged((int)(100.0 * y / height));
+            for (int i = 0; i < values.Length; i++) { 
+                System.Runtime.InteropServices.Marshal.WriteByte(ptr, i * 3, values[i]);
+                System.Runtime.InteropServices.Marshal.WriteByte(ptr, i * 3 + 1, values[i]);
+                System.Runtime.InteropServices.Marshal.WriteByte(ptr, i * 3 + 2, values[i]);
             }
-        } 
+
+            Image.UnlockBits(bitmapData);
+            
+        }  
     }
 }

.vs/Portable Viewer/FileContentIndex/333631a4-b622-439f-b9a6-2aedc24a49ac.vsidx

@@ -6,44 +6,28 @@
 namespace Portable_Viewer {
     public class PM {
         public byte[] buffer;
-        public int cursor = 0;
+        public Parser parser;
 
-        public string magic;
-        public string comment;
+        public string magic; 
         public int width;
         public int height; 
         public int maxval;
+        public byte[] values;
 
-        public Bitmap Image;
-
-        public delegate void ProgressChangedEventHandler(object sender, int progress);
-        public event ProgressChangedEventHandler Progress;
+        public Bitmap Image; 
 
         public PM(string path) {
             buffer = System.IO.File.ReadAllBytes(path); 
+            parser = new Parser(buffer);
         }
+ 
+        public virtual void Load() { }
+         
 
-        public string ReadToEndOfLine() { 
-            int nextEOLPos = cursor;
-            while (true) {
-                if (buffer[nextEOLPos] == '\n') {
-                    int nextCursor = nextEOLPos + 1;
-                    if(buffer[nextEOLPos - 1] == '\r')
-                        nextEOLPos--;
-                    
-                    string result = Encoding.ASCII.GetString(buffer, cursor, nextEOLPos - cursor);
-                    cursor = nextCursor;
-                    return result;
-                }
-                nextEOLPos++;
-            } 
-        }
-
-        public virtual void Parse() { }
-
-        protected virtual void OnProgressChanged(int progress) {
-            if (Progress != null) {
-                Progress(this, progress);
+        
+        public void Normalize(){
+            for (int i = 0; i < values.Length; i++) {
+                values[i] = (byte)(values[i] * 255.0 / maxval);
             }
         }
     }

.vs/Portable Viewer/FileContentIndex/596ce646-87ea-4ddb-ac06-91cc5b4a0874.vsidx

@@ -1,62 +1,47 @@
 using System;
 using System.Collections.Generic;
 using System.Drawing;
+using System.Drawing.Imaging;
 using System.Text;
 
 namespace Portable_Viewer {
     public class PPM : PM {
 
         public PPM(string path) : base(path) { }
+  
+        override public void Load() { 
+            magic = parser.ReadString();
+            if(magic != "P3" && magic != "P6") throw new Exception("Not supported PPM format. Only P3 and P6 are supported.");
 
-        override public void Parse() {
-            magic = ReadToEndOfLine();
-            if (magic != "P3" && magic != "P6") throw new Exception("Not supported PPM format. Only P3 and P6 are supported.");
-            if (buffer[cursor] == '#') comment = ReadToEndOfLine();
-
-            string[] size = ReadToEndOfLine().Split(' ');
-            width = int.Parse(size[0]);
-            height = int.Parse(size[1]);
- 
-            maxval = int.Parse(ReadToEndOfLine());
+            width = parser.ReadInt();
+            height = parser.ReadInt();
+            maxval = parser.ReadInt();
 
             switch (magic) {
                 case "P3":
-                    Parse_P3();
+                    values = parser.ReadBytesByInts(width * height * 3);
                     break;
                 case "P6":
-                    Parse_P6();
+                    values = parser.ReadBytes(width * height * 3);
                     break;
             }
-        }
+            
+            if(maxval != 255) Normalize();
+ 
+            Image = new Bitmap(width, height, PixelFormat.Format32bppArgb);
 
-        void Parse_P3() {
-            Image = new Bitmap(width, height);
-            int r = 0, g = 0, b = 0;
-            string[] values;
-            for (int y = 0; y < height; y++) {
-                values = ReadToEndOfLine().Split(' ');
-                for (int x = 0; x < width; x++) {
-                    r = (int)(int.Parse(values[x * 3]) * 255.0 / maxval);
-                    g = (int)(int.Parse(values[x * 3 + 1]) * 255.0 / maxval);
-                    b = (int)(int.Parse(values[x * 3 + 2]) * 255.0 / maxval);
-                    Image.SetPixel(x, y, Color.FromArgb(r, g, b));
-                }
-                OnProgressChanged((int)(100.0 * y / height));
-            }
-        }
+            BitmapData bitmapData = Image.LockBits(new Rectangle(0, 0, width, height), ImageLockMode.WriteOnly, Image.PixelFormat);
+            IntPtr ptr = bitmapData.Scan0;
 
-        void Parse_P6() {
-            Image = new Bitmap(width, height);
-            int r = 0, g = 0, b = 0;
-            for (int y = 0; y < height; y++) {
-                for (int x = 0; x < width; x++) {
-                    r = (int)(buffer[cursor++] * 255.0 / maxval);
-                    g = (int)(buffer[cursor++] * 255.0 / maxval);
-                    b = (int)(buffer[cursor++] * 255.0 / maxval);
-                    Image.SetPixel(x, y, Color.FromArgb(r, g, b));
-                }
-                OnProgressChanged((int)(100.0 * y / height));
+            for (int i = 0; i < values.Length / 3; i++) {  
+                System.Runtime.InteropServices.Marshal.WriteInt32(
+                    ptr, i * 4, 
+                    (255 << 24) | (values[i * 3 + 0] << 16) | (values[i * 3 + 1] << 8) | (values[i * 3 + 2] << 0)
+                ); 
             }
-        }
+
+            Image.UnlockBits(bitmapData); 
+            
+        }  
     }
 }