Update margin method

@@ -117,18 +117,28 @@ function main()
             let msize = new cv.Size(video.width / 4, video.height / 4);
             classifier.detectMultiScale(dst, faces, 1.1, 3, 0, msize);
             // draw faces.
-        console.log('draw faces');
             for (let i = 0; i < faces.size(); ++i) {
                 let face = faces.get(i);
                 let point1 = new cv.Point(face.x, face.y);
                 let point2 = new cv.Point(face.x + face.width, face.y + face.height);
                 cv.rectangle(dst, point1, point2, [255, 0, 0, 255], 8);
                 let cropped = new cv.Mat();
-                let rect = new cv.Rect(Math.max(face.x-22, 0), Math.max(face.y-44, 0), Math.min(face.width+44, src.cols), Math.min(face.height+66, src.rows));
+                let margin_x = 0;
+                let margin_y = 0;
+                if (face.width > face.height)
+                {
+                    margin_y = (face.width - face.height) / 2;
+                }
+                else
+                {
+                    margin_x = (face.height - face.width) / 2;
+                }
+                Math.max(face.width, face.height)
+                Math.min(face.width, face.height)
+                let rect = new cv.Rect(Math.max(face.x-margin_x, 0), Math.max(face.y-margin_y, 0), Math.min(face.width+margin_x, src.cols), Math.min(face.height+margin_y, src.rows));
                 cropped = src.roi(rect);
                 let tempCanvas = document.createElement("canvas");
                 cv.imshow(tempCanvas,cropped);
-            console.log('b64encode');
                 if (tracker.register(face.x, face.y, face.width, face.height)){
                     let b64encoded = tempCanvas.toDataURL("image/jpeg", 1.0);
                     b64encoded = b64encoded.replace('data:image/jpeg;base64,', '');

@@ -119,14 +119,25 @@ function main()
             let msize = new cv.Size(video.width / 4, video.height / 4);
             classifier.detectMultiScale(dst, faces, 1.1, 3, 0, msize);
             // draw faces.
-        console.log('draw faces');
             for (let i = 0; i < faces.size(); ++i) {
                 let face = faces.get(i);
                 let point1 = new cv.Point(face.x, face.y);
                 let point2 = new cv.Point(face.x + face.width, face.y + face.height);
                 cv.rectangle(dst, point1, point2, [255, 0, 0, 255], 8);
                 let cropped = new cv.Mat();
-                let rect = new cv.Rect(Math.max(face.x-22, 0), Math.max(face.y-44, 0), Math.min(face.width+44, src.cols), Math.min(face.height+66, src.rows));
+                let margin_x = 0;
+                let margin_y = 0;
+                if (face.width > face.height)
+                {
+                    margin_y = (face.width - face.height) / 2;
+                }
+                else
+                {
+                    margin_x = (face.height - face.width) / 2;
+                }
+                Math.max(face.width, face.height)
+                Math.min(face.width, face.height)
+                let rect = new cv.Rect(Math.max(face.x-margin_x, 0), Math.max(face.y-margin_y, 0), Math.min(face.width+margin_x, src.cols), Math.min(face.height+margin_y, src.rows));
                 cropped = src.roi(rect);
                 let tempCanvas = document.createElement("canvas");
                 cv.imshow(tempCanvas,cropped);