Merge branch 'master' of http://gitblit.broconcentric.com:8088/r/M071

wells.liu

2020-07-14 c01cce7ac1dc691c6b667b298ce0637b924102ea

 src/Bro.Device.Gocator/GocatorDriver.cs

@@ -109,12 +109,12 @@
                            if (imgSet != null)
                            {
                                imgSet.HImage = new HImage();
                                imgSet.HImage.GenImage1("int2", (int)width, zoomHeight, zoomPtr);
                                imgSet.HImage.GenImage1("uint2", (int)width, zoomHeight, zoomPtr);
                                //imgSet.HImage = imgSet.HImage.ZoomImageSize((int)width, zoomHeight, "constant");


                                imgSet.HImage_2 = new HImage();
                                imgSet.HImage_2.GenImage1("int2", (int)width, zoomHeight, zoomPtr);
                                imgSet.HImage_2.GenImage1("uint2", (int)width, zoomHeight, zoomPtr);

                                LaserScanParam para = new LaserScanParam()
                                {