Fix bug in pixel extractor transform, and add more unit tests. (#900)

yaeldMS · GalOshri · commit 2c0bb2199c89 · 2018-09-12T16:27:04.000-07:00
diff --git a/src/Microsoft.ML.ImageAnalytics/ImagePixelExtractorTransform.cs b/src/Microsoft.ML.ImageAnalytics/ImagePixelExtractorTransform.cs
@@ -505,30 +505,30 @@ private ValueGetter<VBuffer<TValue>> GetGetterCore<TValue>(IRow input, int iinfo
                         if (ex.Interleave)
                         {
                             int idst = 0;
-                            for (int y = 0; y < h; ++y)
-                                for (int x = 0; x < w; x++)
+                            for (int x = 0; x < w; x++)
+                                for (int y = 0; y < h; ++y)
                                 {
-                                    var pb = src.GetPixel(y, x);
+                                    var pb = src.GetPixel(x, y);
                                     if (vb != null)
                                     {
-                                        if (a) { vb[idst++] = (byte)0; }
+                                        if (a) { vb[idst++] = pb.A; }
                                         if (r) { vb[idst++] = pb.R; }
                                         if (g) { vb[idst++] = pb.G; }
                                         if (b) { vb[idst++] = pb.B; }
                                     }
                                     else if (!needScale)
                                     {
-                                        if (a) { vf[idst++] = 0.0f; }
+                                        if (a) { vf[idst++] = pb.A; }
                                         if (r) { vf[idst++] = pb.R; }
                                         if (g) { vf[idst++] = pb.G; }
                                         if (b) { vf[idst++] = pb.B; }
                                     }
                                     else
                                     {
-                                        if (a) { vf[idst++] = 0.0f; }
+                                        if (a) { vf[idst++] = (pb.A - offset) * scale; }
                                         if (r) { vf[idst++] = (pb.R - offset) * scale; }
-                                        if (g) { vf[idst++] = (pb.B - offset) * scale; }
-                                        if (b) { vf[idst++] = (pb.G - offset) * scale; }
+                                        if (g) { vf[idst++] = (pb.G - offset) * scale; }
+                                        if (b) { vf[idst++] = (pb.B - offset) * scale; }
                                     }
                                 }
                             Contracts.Assert(idst == size);
diff --git a/src/Microsoft.ML.ImageAnalytics/VectorToImageTransform.cs b/src/Microsoft.ML.ImageAnalytics/VectorToImageTransform.cs
@@ -386,7 +386,7 @@ private ValueGetter<Bitmap> GetterFromType<TValue>(IRow input, int iinfo, ColInf
                             float alpha = 0;
                             if (ex.Interleave)
                             {
-                                if (ex.Alpha) position++;
+                                if (ex.Alpha) alpha = Convert.ToSingle(values[position++]);
                                 if (ex.Red) red = Convert.ToSingle(values[position++]);
                                 if (ex.Green) green = Convert.ToSingle(values[position++]);
                                 if (ex.Blue) blue = Convert.ToSingle(values[position++]);
@@ -405,10 +405,10 @@ private ValueGetter<Bitmap> GetterFromType<TValue>(IRow input, int iinfo, ColInf
                             else
                             {
                                 pixel = Color.FromArgb(
-                                    (int)((alpha - offset) * scale),
-                                    (int)((red - offset) * scale),
-                                    (int)((green - offset) * scale),
-                                    (int)((blue - offset) * scale));
+                                    ex.Alpha ? (int)Math.Round((alpha - offset) * scale) : 0,
+                                    (int)Math.Round((red - offset) * scale),
+                                    (int)Math.Round((green - offset) * scale),
+                                    (int)Math.Round((blue - offset) * scale));
                             }
                             dst.SetPixel(x, y, pixel);
                         }
diff --git a/test/Microsoft.ML.Tests/ImagesTests.cs b/test/Microsoft.ML.Tests/ImagesTests.cs

Original file line number	Diff line number	Diff line change
`@@ -505,30 +505,30 @@ private ValueGetter<VBuffer<TValue>> GetGetterCore<TValue>(IRow input, int iinfo`
`505`	`505`	`if (ex.Interleave)`
`506`	`506`	`{`
`507`	`507`	`int idst = 0;`
`508`		`- for (int y = 0; y < h; ++y)`
`509`		`- for (int x = 0; x < w; x++)`
	`508`	`+ for (int x = 0; x < w; x++)`
	`509`	`+ for (int y = 0; y < h; ++y)`
`510`	`510`	`{`
`511`		`- var pb = src.GetPixel(y, x);`
	`511`	`+ var pb = src.GetPixel(x, y);`
`512`	`512`	`if (vb != null)`
`513`	`513`	`{`
`514`		`- if (a) { vb[idst++] = (byte)0; }`
	`514`	`+ if (a) { vb[idst++] = pb.A; }`
`515`	`515`	`if (r) { vb[idst++] = pb.R; }`
`516`	`516`	`if (g) { vb[idst++] = pb.G; }`
`517`	`517`	`if (b) { vb[idst++] = pb.B; }`
`518`	`518`	`}`
`519`	`519`	`else if (!needScale)`
`520`	`520`	`{`
`521`		`- if (a) { vf[idst++] = 0.0f; }`
	`521`	`+ if (a) { vf[idst++] = pb.A; }`
`522`	`522`	`if (r) { vf[idst++] = pb.R; }`
`523`	`523`	`if (g) { vf[idst++] = pb.G; }`
`524`	`524`	`if (b) { vf[idst++] = pb.B; }`
`525`	`525`	`}`
`526`	`526`	`else`
`527`	`527`	`{`
`528`		`- if (a) { vf[idst++] = 0.0f; }`
	`528`	`+ if (a) { vf[idst++] = (pb.A - offset) * scale; }`
`529`	`529`	`if (r) { vf[idst++] = (pb.R - offset) * scale; }`
`530`		`- if (g) { vf[idst++] = (pb.B - offset) * scale; }`
`531`		`- if (b) { vf[idst++] = (pb.G - offset) * scale; }`
	`530`	`+ if (g) { vf[idst++] = (pb.G - offset) * scale; }`
	`531`	`+ if (b) { vf[idst++] = (pb.B - offset) * scale; }`
`532`	`532`	`}`
`533`	`533`	`}`
`534`	`534`	`Contracts.Assert(idst == size);`
Original file line number	Diff line number	Diff line change
`@@ -386,7 +386,7 @@ private ValueGetter<Bitmap> GetterFromType<TValue>(IRow input, int iinfo, ColInf`
`386`	`386`	`float alpha = 0;`
`387`	`387`	`if (ex.Interleave)`
`388`	`388`	`{`
`389`		`- if (ex.Alpha) position++;`
	`389`	`+ if (ex.Alpha) alpha = Convert.ToSingle(values[position++]);`
`390`	`390`	`if (ex.Red) red = Convert.ToSingle(values[position++]);`
`391`	`391`	`if (ex.Green) green = Convert.ToSingle(values[position++]);`
`392`	`392`	`if (ex.Blue) blue = Convert.ToSingle(values[position++]);`
`@@ -405,10 +405,10 @@ private ValueGetter<Bitmap> GetterFromType<TValue>(IRow input, int iinfo, ColInf`
`405`	`405`	`else`
`406`	`406`	`{`
`407`	`407`	`pixel = Color.FromArgb(`
`408`		`- (int)((alpha - offset) * scale),`
`409`		`- (int)((red - offset) * scale),`
`410`		`- (int)((green - offset) * scale),`
`411`		`- (int)((blue - offset) * scale));`
	`408`	`+ ex.Alpha ? (int)Math.Round((alpha - offset) * scale) : 0,`
	`409`	`+ (int)Math.Round((red - offset) * scale),`
	`410`	`+ (int)Math.Round((green - offset) * scale),`
	`411`	`+ (int)Math.Round((blue - offset) * scale));`
`412`	`412`	`}`
`413`	`413`	`dst.SetPixel(x, y, pixel);`
`414`	`414`	`}`