Conv filter ok

S04_Projet/MyImage.cs

@@ -327,7 +327,7 @@ namespace S04_Projet
                     PixelArr[x, y] = new Pixel(r, g, b);
                 }
 
-                return new MyImage(opt, PixelArr);
+                return new MyImage(options, PixelArr);
             }
             else if (filter.GetLength(0) != filter.GetLength(1))
             {
@@ -364,15 +364,14 @@ namespace S04_Projet
 
         public static byte ConvolutionalResult(int[,] matrix, int[,] conv, int size, double factor)
         {
-            int r = 0;
-            for (int i = 0; i < size * size; i++)
-            {
-                int x = i % size;
-                int y = i / size;
-                r += matrix[x, y] * conv[(size - 1) - x, (size - 1) - y];
-            }
+            int r = 0;;
+            for (int x = 0; x < size; x++)
+                for (int y = 0; y < size; y++)
+                    r += matrix[x, y] * conv[x, y];
             r = (int)Math.Round(r * factor);
-            return (byte)r;
+            if (r > 255) return 255;
+            else if (r < 0) return 0;
+            else return (byte)r;
         }
 
         private static int EndianToInt(byte[] arr, int from, int to)

S04_Projet/Program.cs

@@ -54,13 +54,13 @@ namespace S04_Projet
                 { 0, -1, 0 }
             };
 
-            MyImage imgg = new MyImage("img/ex.bmp");
-            //imgg.ApplyConvFilter(identityFilter, 1).Save("id.bmp");
+            MyImage imgg = new MyImage("img/coco.bmp");
+            imgg.ApplyConvFilter(identityFilter, 1).Save("id.bmp");
             imgg.ApplyConvFilter(edgeDetect1Filter, 1).Save("edge1.bmp");
-            //imgg.ApplyConvFilter(edgeDetect2Filter, 1).Save("edge2.bmp");
+            imgg.ApplyConvFilter(edgeDetect2Filter, 1).Save("edge2.bmp");
             imgg.ApplyConvFilter(edgeDetect3Filter, 1).Save("edge3.bmp");
-            //imgg.ApplyConvFilter(sharpenFilter, 1).Save("sharpen.bmp");
-            //imgg.ApplyConvFilter(boxBlurFilter, (double)1/9).Save("blur.bmp");
+            imgg.ApplyConvFilter(sharpenFilter, 1).Save("sharpen.bmp");
+            imgg.ApplyConvFilter(boxBlurFilter, (double)1/9).Save("blur.bmp");
 
             Console.ForegroundColor = ConsoleColor.White;
             Console.WriteLine("#############################################################");