Remove dead code

Commit migrated from https://github.com/dotnet/corefx/commit/df918c2e5ac723c03574bb9aa8f0a9b0aef23339

diff --git a/src/libraries/System.Drawing.Common/tests/mono/System.Drawing.Imaging/BmpCodecTests.cs b/src/libraries/System.Drawing.Common/tests/mono/System.Drawing.Imaging/BmpCodecTests.cs
index 8987970..98e415c 100644 (file)
--- a/src/libraries/System.Drawing.Common/tests/mono/System.Drawing.Imaging/BmpCodecTests.cs
+++ b/src/libraries/System.Drawing.Common/tests/mono/System.Drawing.Imaging/BmpCodecTests.cs
@@ -95,12 +95,6 @@ namespace MonoTests.System.Drawing.Imaging
             string sInFile = Helpers.GetTestBitmapPath("almogaver1bit.bmp");
             using (Bitmap bmp = new Bitmap(sInFile))
             {
-#if false
-                               for (int x = 0; x < bmp.Width; x += 32) {
-                                       for (int y = 0; y < bmp.Height; y += 32)
-                                               Console.WriteLine ("\t\t\t\tAssert.Equal ({0}, bmp.GetPixel ({1}, {2}).ToArgb (), \"{1},{2}\");", bmp.GetPixel (x, y).ToArgb (), x, y);
-                               }
-#else
                 // sampling values from a well known bitmap
                 Assert.Equal(-1, bmp.GetPixel(0, 0).ToArgb());
                 Assert.Equal(-4144960, bmp.GetPixel(0, 32).ToArgb());
@@ -138,7 +132,6 @@ namespace MonoTests.System.Drawing.Imaging
                 Assert.Equal(-4144960, bmp.GetPixel(160, 96).ToArgb());
                 Assert.Equal(-4144960, bmp.GetPixel(160, 128).ToArgb());
                 Assert.Equal(-8355712, bmp.GetPixel(160, 160).ToArgb());
-#endif
             }
         }
 
@@ -172,12 +165,6 @@ namespace MonoTests.System.Drawing.Imaging
             string sInFile = Helpers.GetTestBitmapPath("almogaver8bits.bmp");
             using (Bitmap bmp = new Bitmap(sInFile))
             {
-#if false
-                               for (int x = 0; x < bmp.Width; x += 32) {
-                                       for (int y = 0; y < bmp.Height; y += 32)
-                                               Console.WriteLine ("\t\t\t\tAssert.Equal ({0}, bmp.GetPixel ({1}, {2}).ToArgb (), \"{1},{2}\");", bmp.GetPixel (x, y).ToArgb (), x, y);
-                               }
-#else
                 // sampling values from a well known bitmap
                 Assert.Equal(-1040, bmp.GetPixel(0, 0).ToArgb());
                 Assert.Equal(-4137792, bmp.GetPixel(0, 32).ToArgb());
@@ -215,7 +202,6 @@ namespace MonoTests.System.Drawing.Imaging
                 Assert.Equal(-4137792, bmp.GetPixel(160, 96).ToArgb());
                 Assert.Equal(-4137792, bmp.GetPixel(160, 128).ToArgb());
                 Assert.Equal(-8355712, bmp.GetPixel(160, 160).ToArgb());
-#endif
             }
         }
 
@@ -250,12 +236,6 @@ namespace MonoTests.System.Drawing.Imaging
             string sInFile = Helpers.GetTestBitmapPath("almogaver24bits.bmp");
             using (Bitmap bmp = new Bitmap(sInFile))
             {
-#if false
-                               for (int x = 0; x < bmp.Width; x += 32) {
-                                       for (int y = 0; y < bmp.Height; y += 32)
-                                               Console.WriteLine ("\t\t\t\tAssert.Equal ({0}, bmp.GetPixel ({1}, {2}).ToArgb (), \"{1},{2}\");", bmp.GetPixel (x, y).ToArgb (), x, y);
-                               }
-#else
                 // sampling values from a well known bitmap
                 Assert.Equal(-1645353, bmp.GetPixel(0, 32).ToArgb());
                 Assert.Equal(-461332, bmp.GetPixel(0, 64).ToArgb());
@@ -292,7 +272,6 @@ namespace MonoTests.System.Drawing.Imaging
                 Assert.Equal(-2435382, bmp.GetPixel(160, 96).ToArgb());
                 Assert.Equal(-2501944, bmp.GetPixel(160, 128).ToArgb());
                 Assert.Equal(-9211799, bmp.GetPixel(160, 160).ToArgb());
-#endif
             }
         }
 
@@ -314,12 +293,6 @@ namespace MonoTests.System.Drawing.Imaging
                     unsafe
                     {
                         byte* scan = (byte*)data.Scan0;
-#if false
-                                               // 1009 is the first prime after 1000 (so we're not affected by a recurring pattern)
-                                               for (int p = 0; p < size; p += 1009) {
-                                                       Console.WriteLine ("\t\t\t\t\t\tAssert.Equal ({0}, *(scan + {1}), \"{1}\");", *(scan + p), p);
-                                               }
-#else
                         // sampling values from a well known bitmap
                         Assert.Equal(217, *(scan + 0));
                         Assert.Equal(192, *(scan + 1009));
@@ -416,7 +389,6 @@ namespace MonoTests.System.Drawing.Imaging
                         Assert.Equal(0, *(scan + 92828));
                         Assert.Equal(146, *(scan + 93837));
                         Assert.Equal(163, *(scan + 94846));
-#endif
                     }
                 }
                 finally
@@ -456,12 +428,6 @@ namespace MonoTests.System.Drawing.Imaging
             using (Bitmap bmp = new Bitmap(sInFile))
             {
                 Assert.Equal(PixelFormat.Format32bppRgb, bmp.PixelFormat);
-#if false
-                               for (int x = 0; x < bmp.Width; x += 32) {
-                                       for (int y = 0; y < bmp.Height; y += 32)
-                                               Console.WriteLine ("\t\t\t\tAssert.Equal ({0}, bmp.GetPixel ({1}, {2}).ToArgb (), \"{1},{2}\");", bmp.GetPixel (x, y).ToArgb (), x, y);
-                               }
-#else
                 // sampling values from a well known bitmap
                 Assert.Equal(-1579559, bmp.GetPixel(0, 0).ToArgb());
                 Assert.Equal(-1645353, bmp.GetPixel(0, 32).ToArgb());
@@ -499,7 +465,6 @@ namespace MonoTests.System.Drawing.Imaging
                 Assert.Equal(-2435382, bmp.GetPixel(160, 96).ToArgb());
                 Assert.Equal(-2501944, bmp.GetPixel(160, 128).ToArgb());
                 Assert.Equal(-9211799, bmp.GetPixel(160, 160).ToArgb());
-#endif
             }
         }
 

diff --git a/src/libraries/System.Drawing.Common/tests/mono/System.Drawing.Imaging/GifCodecTests.cs b/src/libraries/System.Drawing.Common/tests/mono/System.Drawing.Imaging/GifCodecTests.cs
index 1f8298e..9f29fd6 100644 (file)
--- a/src/libraries/System.Drawing.Common/tests/mono/System.Drawing.Imaging/GifCodecTests.cs
+++ b/src/libraries/System.Drawing.Common/tests/mono/System.Drawing.Imaging/GifCodecTests.cs
@@ -101,12 +101,6 @@ namespace MonoTests.System.Drawing.Imaging
         {
             using (Bitmap bmp = new Bitmap(filename))
             {
-#if false
-                               for (int x = 0; x < bmp.Width; x += 32) {
-                                       for (int y = 0; y < bmp.Height; y += 32)
-                                               Console.WriteLine ("\t\t\t\tAssert.Equal ({0}, bmp.GetPixel ({1}, {2}).ToArgb (), \"{1},{2}\");", bmp.GetPixel (x, y).ToArgb (), x, y);
-                               }
-#else
                 // sampling values from a well known bitmap
                 Assert.Equal(-10644802, bmp.GetPixel(0, 0).ToArgb());
                 Assert.Equal(-12630705, bmp.GetPixel(0, 32).ToArgb());
@@ -124,7 +118,6 @@ namespace MonoTests.System.Drawing.Imaging
                 Assert.Equal(-7766649, bmp.GetPixel(96, 32).ToArgb());
                 Assert.Equal(-11512986, bmp.GetPixel(96, 64).ToArgb());
                 Assert.Equal(-12616230, bmp.GetPixel(96, 96).ToArgb());
-#endif
             }
         }
 
@@ -157,12 +150,6 @@ namespace MonoTests.System.Drawing.Imaging
                     unsafe
                     {
                         byte* scan = (byte*)data.Scan0;
-#if false
-                                               // 1009 is the first prime after 1000 (so we're not affected by a recurring pattern)
-                                               for (int p = 0; p < size; p += 1009) {
-                                                       Console.WriteLine ("\t\t\t\t\t\tAssert.Equal ({0}, *(scan + {1}), \"{1}\");", *(scan + p), p);
-                                               }
-#else
                         // sampling values from a well known bitmap
                         Assert.Equal(190, *(scan + 0));
                         Assert.Equal(217, *(scan + 1009));
@@ -197,7 +184,6 @@ namespace MonoTests.System.Drawing.Imaging
                         Assert.Equal(99, *(scan + 30270));
                         Assert.Equal(67, *(scan + 31279));
                         Assert.Equal(142, *(scan + 32288));
-#endif
                     }
                 }
                 finally

diff --git a/src/libraries/System.Drawing.Common/tests/mono/System.Drawing.Imaging/IconCodecTests.cs b/src/libraries/System.Drawing.Common/tests/mono/System.Drawing.Imaging/IconCodecTests.cs
index 2c88de4..f5cbec5 100644 (file)
--- a/src/libraries/System.Drawing.Common/tests/mono/System.Drawing.Imaging/IconCodecTests.cs
+++ b/src/libraries/System.Drawing.Common/tests/mono/System.Drawing.Imaging/IconCodecTests.cs
@@ -140,12 +140,6 @@ namespace MonoTests.System.Drawing.Imaging
             string sInFile = Helpers.GetTestBitmapPath("48x48_multiple_entries_4bit.ico");
             using (Bitmap bmp = new Bitmap(sInFile))
             {
-#if false
-                               for (int x = 0; x < bmp.Width; x += 4) {
-                                       for (int y = 0; y < bmp.Height; y += 4)
-                                               Console.WriteLine ("\t\t\t\tAssert.Equal ({0}, bmp.GetPixel ({1}, {2}).ToArgb (), \"{1},{2}\");", bmp.GetPixel (x, y).ToArgb (), x, y);
-                               }
-#else
                 // sampling values from a well known bitmap
                 Assert.Equal(0, bmp.GetPixel(0, 0).ToArgb());
                 Assert.Equal(0, bmp.GetPixel(0, 4).ToArgb());
@@ -163,7 +157,6 @@ namespace MonoTests.System.Drawing.Imaging
                 Assert.Equal(0, bmp.GetPixel(12, 4).ToArgb());
                 Assert.Equal(-8355840, bmp.GetPixel(12, 8).ToArgb());
                 Assert.Equal(0, bmp.GetPixel(12, 12).ToArgb());
-#endif
             }
         }
 
@@ -183,12 +176,6 @@ namespace MonoTests.System.Drawing.Imaging
                     unsafe
                     {
                         byte* scan = (byte*)data.Scan0;
-#if false
-                                               // 13 is prime (so we're not affected by a recurring pattern)
-                                               for (int p = 0; p < size; p += 13) {
-                                                       Console.WriteLine ("\t\t\t\t\t\tAssert.Equal ({0}, *(scan + {1}), \"{1}\");", *(scan + p), p);
-                                               }
-#else
                         // sampling values from a well known bitmap
                         Assert.Equal(0, *(scan + 0));
                         Assert.Equal(0, *(scan + 13));
@@ -250,7 +237,6 @@ namespace MonoTests.System.Drawing.Imaging
                         Assert.Equal(0, *(scan + 741));
                         Assert.Equal(0, *(scan + 754));
                         Assert.Equal(0, *(scan + 767));
-#endif
                     }
                 }
                 finally
@@ -315,12 +301,6 @@ namespace MonoTests.System.Drawing.Imaging
             string sInFile = Helpers.GetTestBitmapPath("VisualPng.ico");
             using (Bitmap bmp = new Bitmap(sInFile))
             {
-#if false
-                               for (int x = 0; x < bmp.Width; x += 4) {
-                                       for (int y = 0; y < bmp.Height; y += 4)
-                                               Console.WriteLine ("\t\t\t\tAssert.Equal ({0}, bmp.GetPixel ({1}, {2}).ToArgb (), \"{1},{2}\");", bmp.GetPixel (x, y).ToArgb (), x, y);
-                               }
-#else
                 // sampling values from a well known bitmap
                 Assert.Equal(0, bmp.GetPixel(0, 0).ToArgb());
                 Assert.Equal(-8388608, bmp.GetPixel(0, 4).ToArgb());
@@ -386,7 +366,6 @@ namespace MonoTests.System.Drawing.Imaging
                 Assert.Equal(0, bmp.GetPixel(28, 20).ToArgb());
                 Assert.Equal(-8388608, bmp.GetPixel(28, 24).ToArgb());
                 Assert.Equal(0, bmp.GetPixel(28, 28).ToArgb());
-#endif
             }
         }
 
@@ -406,12 +385,6 @@ namespace MonoTests.System.Drawing.Imaging
                     unsafe
                     {
                         byte* scan = (byte*)data.Scan0;
-#if false
-                                               // 13 is prime (so we're not affected by a recurring pattern)
-                                               for (int p = 0; p < size; p += 13) {
-                                                       Console.WriteLine ("\t\t\t\t\t\tAssert.Equal ({0}, *(scan + {1}), \"{1}\");", *(scan + p), p);
-                                               }
-#else
                         // sampling values from a well known bitmap
                         Assert.Equal(0, *(scan + 0));
                         Assert.Equal(0, *(scan + 13));
@@ -482,7 +455,6 @@ namespace MonoTests.System.Drawing.Imaging
                         Assert.Equal(0, *(scan + 858));
                         Assert.Equal(0, *(scan + 871));
                         Assert.Equal(0, *(scan + 884));
-#endif
                     }
                 }
                 finally
@@ -533,12 +505,6 @@ namespace MonoTests.System.Drawing.Imaging
             string sInFile = Helpers.GetTestBitmapPath("48x48_one_entry_1bit.ico");
             using (Bitmap bmp = new Bitmap(sInFile))
             {
-#if false
-                               for (int x = 0; x < bmp.Width; x += 4) {
-                                       for (int y = 0; y < bmp.Height; y += 4)
-                                               Console.WriteLine ("\t\t\t\tAssert.Equal ({0}, bmp.GetPixel ({1}, {2}).ToArgb (), \"{1},{2}\");", bmp.GetPixel (x, y).ToArgb (), x, y);
-                               }
-#else
                 // sampling values from a well known bitmap
                 Assert.Equal(-16777216, bmp.GetPixel(0, 0).ToArgb());
                 Assert.Equal(-16777216, bmp.GetPixel(0, 4).ToArgb());
@@ -617,7 +583,6 @@ namespace MonoTests.System.Drawing.Imaging
                 Assert.Equal(-16777216, bmp.GetPixel(24, 8).ToArgb());
                 Assert.Equal(-1, bmp.GetPixel(24, 12).ToArgb());
                 Assert.Equal(0, bmp.GetPixel(24, 16).ToArgb());
-#endif
             }
         }
 
@@ -637,12 +602,6 @@ namespace MonoTests.System.Drawing.Imaging
                     unsafe
                     {
                         byte* scan = (byte*)data.Scan0;
-#if false
-                                               // 13 is prime (so we're not affected by a recurring pattern)
-                                               for (int p = 0; p < size; p += 13) {
-                                                       Console.WriteLine ("\t\t\t\t\t\tAssert.Equal ({0}, *(scan + {1}), \"{1}\");", *(scan + p), p);
-                                               }
-#else
                         // sampling values from a well known bitmap
                         Assert.Equal(0, *(scan + 0));
                         Assert.Equal(0, *(scan + 13));
@@ -717,7 +676,6 @@ namespace MonoTests.System.Drawing.Imaging
                         Assert.Equal(0, *(scan + 910));
                         Assert.Equal(0, *(scan + 923));
                         Assert.Equal(0, *(scan + 936));
-#endif
                     }
                 }
                 finally
@@ -766,12 +724,6 @@ namespace MonoTests.System.Drawing.Imaging
             string sInFile = Helpers.GetTestBitmapPath("64x64_one_entry_8bit.ico");
             using (Bitmap bmp = new Bitmap(sInFile))
             {
-#if false
-                               for (int x = 0; x < bmp.Width; x += 4) {
-                                       for (int y = 0; y < bmp.Height; y += 4)
-                                               Console.WriteLine ("\t\t\t\tAssert.Equal ({0}, bmp.GetPixel ({1}, {2}).ToArgb (), \"{1},{2}\");", bmp.GetPixel (x, y).ToArgb (), x, y);
-                               }
-#else
                 // sampling values from a well known bitmap
                 Assert.Equal(-65383, bmp.GetPixel(0, 0).ToArgb());
                 Assert.Equal(-65383, bmp.GetPixel(0, 4).ToArgb());
@@ -832,7 +784,6 @@ namespace MonoTests.System.Drawing.Imaging
                 Assert.Equal(-33664, bmp.GetPixel(12, 32).ToArgb());
                 Assert.Equal(-33664, bmp.GetPixel(12, 36).ToArgb());
                 Assert.Equal(-33664, bmp.GetPixel(12, 40).ToArgb());
-#endif
             }
         }
 
@@ -852,12 +803,6 @@ namespace MonoTests.System.Drawing.Imaging
                     unsafe
                     {
                         byte* scan = (byte*)data.Scan0;
-#if false
-                                               // 97 is prime (so we're not affected by a recurring pattern)
-                                               for (int p = 0; p < size; p += 97) {
-                                                       Console.WriteLine ("\t\t\t\t\t\tAssert.Equal ({0}, *(scan + {1}), \"{1}\");", *(scan + p), p);
-                                               }
-#else
                         // sampling values from a well known bitmap
                         Assert.Equal(153, *(scan + 0));
                         Assert.Equal(0, *(scan + 97));
@@ -986,7 +931,6 @@ namespace MonoTests.System.Drawing.Imaging
                         Assert.Equal(0, *(scan + 12028));
                         Assert.Equal(255, *(scan + 12125));
                         Assert.Equal(153, *(scan + 12222));
-#endif
                     }
                 }
                 finally
@@ -1035,12 +979,6 @@ namespace MonoTests.System.Drawing.Imaging
             string sInFile = Helpers.GetTestBitmapPath("96x96x256.ico");
             using (Bitmap bmp = new Bitmap(sInFile))
             {
-#if false
-                               for (int x = 0; x < bmp.Width; x += 4) {
-                                       for (int y = 0; y < bmp.Height; y += 4)
-                                               Console.WriteLine ("\t\t\t\tAssert.Equal ({0}, bmp.GetPixel ({1}, {2}).ToArgb (), \"{1},{2}\");", bmp.GetPixel (x, y).ToArgb (), x, y);
-                               }
-#else
                 // sampling values from a well known bitmap
                 Assert.Equal(0, bmp.GetPixel(0, 0).ToArgb());
                 Assert.Equal(0, bmp.GetPixel(0, 4).ToArgb());
@@ -1618,7 +1556,6 @@ namespace MonoTests.System.Drawing.Imaging
                 Assert.Equal(-65383, bmp.GetPixel(92, 84).ToArgb());
                 Assert.Equal(-65383, bmp.GetPixel(92, 88).ToArgb());
                 Assert.Equal(-65383, bmp.GetPixel(92, 92).ToArgb());
-#endif
             }
         }
 
@@ -1638,12 +1575,6 @@ namespace MonoTests.System.Drawing.Imaging
                     unsafe
                     {
                         byte* scan = (byte*)data.Scan0;
-#if false
-                                               // 97 is prime (so we're not affected by a recurring pattern)
-                                               for (int p = 0; p < size; p += 97) {
-                                                       Console.WriteLine ("\t\t\t\t\t\tAssert.Equal ({0}, *(scan + {1}), \"{1}\");", *(scan + p), p);
-                                               }
-#else
                         // sampling values from a well known bitmap
                         Assert.Equal(0, *(scan + 0));
                         Assert.Equal(0, *(scan + 97));
@@ -1931,7 +1862,6 @@ namespace MonoTests.System.Drawing.Imaging
                         Assert.Equal(0, *(scan + 27451));
                         Assert.Equal(0, *(scan + 27548));
                         Assert.Equal(0, *(scan + 27645));
-#endif
                     }
                 }
                 finally

diff --git a/src/libraries/System.Drawing.Common/tests/mono/System.Drawing.Imaging/JpegCodecTests.cs b/src/libraries/System.Drawing.Common/tests/mono/System.Drawing.Imaging/JpegCodecTests.cs
index 6c312c1..85cee92 100644 (file)
--- a/src/libraries/System.Drawing.Common/tests/mono/System.Drawing.Imaging/JpegCodecTests.cs
+++ b/src/libraries/System.Drawing.Common/tests/mono/System.Drawing.Imaging/JpegCodecTests.cs
@@ -111,12 +111,6 @@ namespace MonoTests.System.Drawing.Imaging
             string sInFile = Helpers.GetTestBitmapPath("nature-greyscale.jpg");
             using (Bitmap bmp = new Bitmap(sInFile))
             {
-#if false
-                               for (int x = 0; x < bmp.Width; x += 32) {
-                                       for (int y = 0; y < bmp.Height; y += 32)
-                                               Console.WriteLine ("\t\t\t\tAssert.Equal ({0}, bmp.GetPixel ({1}, {2}).ToArgb (), \"{1},{2}\");", bmp.GetPixel (x, y).ToArgb (), x, y);
-                               }
-#else
                 // sampling values from a well known bitmap
                 Assert.Equal(-7697782, bmp.GetPixel(0, 0).ToArgb());
                 Assert.Equal(-12171706, bmp.GetPixel(0, 32).ToArgb());
@@ -134,7 +128,6 @@ namespace MonoTests.System.Drawing.Imaging
                 Assert.Equal(-8224126, bmp.GetPixel(96, 32).ToArgb());
                 Assert.Equal(-11053225, bmp.GetPixel(96, 64).ToArgb());
                 Assert.Equal(-9211021, bmp.GetPixel(96, 96).ToArgb());
-#endif
             }
         }
 
@@ -154,12 +147,6 @@ namespace MonoTests.System.Drawing.Imaging
                     unsafe
                     {
                         byte* scan = (byte*)data.Scan0;
-#if false
-                                               // 1009 is the first prime after 1000 (so we're not affected by a recurring pattern)
-                                               for (int p = 0; p < size; p += 1009) {
-                                                       Console.WriteLine ("\t\t\t\t\t\tAssert.Equal ({0}, *(scan + {1}), \"{1}\");", *(scan + p), p);
-                                               }
-#else
                         // sampling values from a well known bitmap
                         Assert.Equal(138, *(scan + 0));
                         Assert.Equal(203, *(scan + 1009));
@@ -194,7 +181,6 @@ namespace MonoTests.System.Drawing.Imaging
                         Assert.Equal(87, *(scan + 30270));
                         Assert.Equal(85, *(scan + 31279));
                         Assert.Equal(106, *(scan + 32288));
-#endif
                     }
                 }
                 finally
@@ -245,12 +231,6 @@ namespace MonoTests.System.Drawing.Imaging
             string sInFile = Helpers.GetTestBitmapPath("nature24bits.jpg");
             using (Bitmap bmp = new Bitmap(sInFile))
             {
-#if false
-                               for (int x = 0; x < bmp.Width; x += 32) {
-                                       for (int y = 0; y < bmp.Height; y += 32)
-                                               Console.WriteLine ("\t\t\t\tAssert.Equal ({0}, bmp.GetPixel ({1}, {2}).ToArgb (), \"{1},{2}\");", bmp.GetPixel (x, y).ToArgb (), x, y);
-                               }
-#else
                 // sampling values from a well known bitmap
                 Assert.Equal(-10447423, bmp.GetPixel(0, 0).ToArgb());
                 Assert.Equal(-12171958, bmp.GetPixel(0, 32).ToArgb());
@@ -268,7 +248,6 @@ namespace MonoTests.System.Drawing.Imaging
                 Assert.Equal(-8224378, bmp.GetPixel(96, 32).ToArgb());
                 Assert.Equal(-11053718, bmp.GetPixel(96, 64).ToArgb());
                 Assert.Equal(-12944166, bmp.GetPixel(96, 96).ToArgb());
-#endif
             }
         }
 
@@ -289,12 +268,6 @@ namespace MonoTests.System.Drawing.Imaging
                     unsafe
                     {
                         byte* scan = (byte*)data.Scan0;
-#if false
-                                               // 1009 is the first prime after 1000 (so we're not affected by a recurring pattern)
-                                               for (int p = 0; p < size; p += 1009) {
-                                                       Console.WriteLine ("\t\t\t\t\t\tAssert.Equal ({0}, *(scan + {1}), \"{1}\");", *(scan + p), p);
-                                               }
-#else
                         // sampling values from a well known bitmap
                         Assert.Equal(217, *(scan + 0));
                         Assert.Equal(192, *(scan + 1009));
@@ -391,7 +364,6 @@ namespace MonoTests.System.Drawing.Imaging
                         Assert.Equal(0, *(scan + 92828));
                         Assert.Equal(146, *(scan + 93837));
                         Assert.Equal(163, *(scan + 94846));
-#endif
                     }
                 }
                 finally

diff --git a/src/libraries/System.Drawing.Common/tests/mono/System.Drawing.Imaging/PngCodecTesst.cs b/src/libraries/System.Drawing.Common/tests/mono/System.Drawing.Imaging/PngCodecTesst.cs
index c59879b..68f4b51 100644 (file)
--- a/src/libraries/System.Drawing.Common/tests/mono/System.Drawing.Imaging/PngCodecTesst.cs
+++ b/src/libraries/System.Drawing.Common/tests/mono/System.Drawing.Imaging/PngCodecTesst.cs
@@ -122,12 +122,6 @@ namespace MonoTests.System.Drawing.Imaging
             string sInFile = Helpers.GetTestBitmapPath("1bit.png");
             using (Bitmap bmp = new Bitmap(sInFile))
             {
-#if false
-                               for (int x = 0; x < bmp.Width; x += 32) {
-                                       for (int y = 0; y < bmp.Height; y += 32)
-                                               Console.WriteLine ("\t\t\t\tAssert.Equal ({0}, bmp.GetPixel ({1}, {2}).ToArgb (), \"{1},{2}\");", bmp.GetPixel (x, y).ToArgb (), x, y);
-                               }
-#else
                 // sampling values from a well known bitmap
                 Assert.Equal(-1, bmp.GetPixel(0, 0).ToArgb());
                 Assert.Equal(-1, bmp.GetPixel(0, 32).ToArgb());
@@ -195,7 +189,6 @@ namespace MonoTests.System.Drawing.Imaging
                 Assert.Equal(-1, bmp.GetPixel(160, 96).ToArgb());
                 Assert.Equal(-16777216, bmp.GetPixel(160, 128).ToArgb());
                 Assert.Equal(-1, bmp.GetPixel(160, 160).ToArgb());
-#endif
             }
         }
 
@@ -216,12 +209,6 @@ namespace MonoTests.System.Drawing.Imaging
                     unsafe
                     {
                         byte* scan = (byte*)data.Scan0;
-#if false
-                                               // 1009 is the first prime after 1000 (so we're not affected by a recurring pattern)
-                                               for (int p = 0; p < size; p += 1009) {
-                                                       Console.WriteLine ("\t\t\t\t\t\tAssert.Equal ({0}, *(scan + {1}), \"{1}\");", *(scan + p), p);
-                                               }
-#else
                         // sampling values from a well known bitmap
                         Assert.Equal(255, *(scan + 0));
                         Assert.Equal(255, *(scan + 1009));
@@ -297,7 +284,6 @@ namespace MonoTests.System.Drawing.Imaging
                         Assert.Equal(0, *(scan + 71639));
                         Assert.Equal(0, *(scan + 72648));
                         Assert.Equal(255, *(scan + 73657));
-#endif
                     }
                 }
                 finally
@@ -349,12 +335,6 @@ namespace MonoTests.System.Drawing.Imaging
             string sInFile = Helpers.GetTestBitmapPath("81674-2bpp.png");
             using (Bitmap bmp = new Bitmap(sInFile))
             {
-#if false
-                               for (int x = 0; x < bmp.Width; x += 32) {
-                                       for (int y = 0; y < bmp.Height; y += 32)
-                                               Console.WriteLine ("\t\t\t\tAssert.Equal ({0}, bmp.GetPixel ({1}, {2}).ToArgb (), \"{1},{2}\");", bmp.GetPixel (x, y).ToArgb (), x, y);
-                               }
-#else
                 // sampling values from a well known bitmap
                 Assert.Equal(-11249559, bmp.GetPixel(0, 0).ToArgb());
                 Assert.Equal(-11249559, bmp.GetPixel(0, 32).ToArgb());
@@ -372,7 +352,6 @@ namespace MonoTests.System.Drawing.Imaging
                 Assert.Equal(-11249559, bmp.GetPixel(96, 32).ToArgb());
                 Assert.Equal(-11249559, bmp.GetPixel(96, 64).ToArgb());
                 Assert.Equal(-11249559, bmp.GetPixel(96, 96).ToArgb());
-#endif
             }
         }
 
@@ -396,12 +375,6 @@ namespace MonoTests.System.Drawing.Imaging
                     unsafe
                     {
                         byte* scan = (byte*)data.Scan0;
-#if false
-                                               // 1009 is the first prime after 1000 (so we're not affected by a recurring pattern)
-                                               for (int p = 0; p < size; p += 1009) {
-                                                       Console.WriteLine ("\t\t\t\t\t\tAssert.Equal ({0}, *(scan + {1}), \"{1}\");", *(scan + p), p);
-                                               }
-#else
                         // sampling values from a well known bitmap
                         Assert.Equal(105, *(scan + 0));
                         Assert.Equal(88, *(scan + 1009));
@@ -433,7 +406,6 @@ namespace MonoTests.System.Drawing.Imaging
                         Assert.Equal(105, *(scan + 27243));
                         Assert.Equal(88, *(scan + 28252));
                         Assert.Equal(84, *(scan + 29261));
-#endif
                     }
                 }
                 finally
@@ -493,12 +465,6 @@ namespace MonoTests.System.Drawing.Imaging
             string sInFile = Helpers.GetTestBitmapPath("4bit.png");
             using (Bitmap bmp = new Bitmap(sInFile))
             {
-#if false
-                               for (int x = 0; x < bmp.Width; x += 32) {
-                                       for (int y = 0; y < bmp.Height; y += 32)
-                                               Console.WriteLine ("\t\t\t\tAssert.Equal ({0}, bmp.GetPixel ({1}, {2}).ToArgb (), \"{1},{2}\");", bmp.GetPixel (x, y).ToArgb (), x, y);
-                               }
-#else
                 // sampling values from a well known bitmap
                 Assert.Equal(-10381134, bmp.GetPixel(0, 0).ToArgb());
                 Assert.Equal(-1314578, bmp.GetPixel(0, 32).ToArgb());
@@ -567,7 +533,6 @@ namespace MonoTests.System.Drawing.Imaging
                 Assert.Equal(-12106173, bmp.GetPixel(160, 128).ToArgb());
                 Assert.Equal(-5790569, bmp.GetPixel(160, 160).ToArgb());
                 Assert.Equal(-12106173, bmp.GetPixel(160, 192).ToArgb());
-#endif
             }
         }
 
@@ -588,12 +553,6 @@ namespace MonoTests.System.Drawing.Imaging
                     unsafe
                     {
                         byte* scan = (byte*)data.Scan0;
-#if false
-                                               // 1009 is the first prime after 1000 (so we're not affected by a recurring pattern)
-                                               for (int p = 0; p < size; p += 1009) {
-                                                       Console.WriteLine ("\t\t\t\t\t\tAssert.Equal ({0}, *(scan + {1}), \"{1}\");", *(scan + p), p);
-                                               }
-#else
                         // sampling values from a well known bitmap
                         Assert.Equal(178, *(scan + 0));
                         Assert.Equal(184, *(scan + 1009));
@@ -669,7 +628,6 @@ namespace MonoTests.System.Drawing.Imaging
                         Assert.Equal(71, *(scan + 71639));
                         Assert.Equal(90, *(scan + 72648));
                         Assert.Equal(240, *(scan + 73657));
-#endif
                     }
                 }
                 finally

diff --git a/src/libraries/System.Drawing.Common/tests/mono/System.Drawing.Imaging/TiffCodecTests.cs b/src/libraries/System.Drawing.Common/tests/mono/System.Drawing.Imaging/TiffCodecTests.cs
index 195441e..fe7c028 100644 (file)
--- a/src/libraries/System.Drawing.Common/tests/mono/System.Drawing.Imaging/TiffCodecTests.cs
+++ b/src/libraries/System.Drawing.Common/tests/mono/System.Drawing.Imaging/TiffCodecTests.cs
@@ -91,12 +91,6 @@ namespace MonoTests.System.Drawing.Imaging
             string sInFile = Helpers.GetTestBitmapPath("almogaver32bits.tif");
             using (Bitmap bmp = new Bitmap(sInFile))
             {
-#if false
-                               for (int x = 0; x < bmp.Width; x += 32) {
-                                       for (int y = 0; y < bmp.Height; y += 32)
-                                               Console.WriteLine ("\t\t\t\tAssert.Equal ({0}, bmp.GetPixel ({1}, {2}).ToArgb (), \"{1},{2}\");", bmp.GetPixel (x, y).ToArgb (), x, y);
-                               }
-#else
                 // sampling values from a well known bitmap
                 Assert.Equal(-1579559, bmp.GetPixel(0, 0).ToArgb());
                 Assert.Equal(-1645353, bmp.GetPixel(0, 32).ToArgb());
@@ -134,7 +128,6 @@ namespace MonoTests.System.Drawing.Imaging
                 Assert.Equal(-2435382, bmp.GetPixel(160, 96).ToArgb());
                 Assert.Equal(-2501944, bmp.GetPixel(160, 128).ToArgb());
                 Assert.Equal(-9211799, bmp.GetPixel(160, 160).ToArgb());
-#endif
             }
         }
 
@@ -155,12 +148,6 @@ namespace MonoTests.System.Drawing.Imaging
                     unsafe
                     {
                         byte* scan = (byte*)data.Scan0;
-#if false
-                                               // 1009 is the first prime after 1000 (so we're not affected by a recurring pattern)
-                                               for (int p = 0; p < size; p += 1009) {
-                                                       Console.WriteLine ("\t\t\t\t\t\tAssert.Equal ({0}, *(scan + {1}), \"{1}\");", *(scan + p), p);
-                                               }
-#else
                         // sampling values from a well known bitmap
                         Assert.Equal(217, *(scan + 0));
                         Assert.Equal(192, *(scan + 1009));
@@ -257,7 +244,6 @@ namespace MonoTests.System.Drawing.Imaging
                         Assert.Equal(0, *(scan + 92828));
                         Assert.Equal(146, *(scan + 93837));
                         Assert.Equal(163, *(scan + 94846));
-#endif
                     }
                 }
                 finally