[src] Minor fixes to nnet3-egs-augment-image.cc

diff --git a/src/nnet3bin/nnet3-egs-augment-image.cc b/src/nnet3bin/nnet3-egs-augment-image.cc
index 07f5d2e91dedb9e35ce64d7e07e2d2d0296afd1b..cfbae8d410bcf9eba3919dab5e11a014277e8c21 100644 (file)
--- a/src/nnet3bin/nnet3-egs-augment-image.cc
+++ b/src/nnet3bin/nnet3-egs-augment-image.cc
@@ -127,78 +127,78 @@ void ApplyAffineTransform(MatrixBase<BaseFloat> &transform,
       // These weights determine how much each of the 4 points contributes
       // to the final interpolated value:
       BaseFloat weight_11 = (r2 - r_old) * (c2 - c_old),
-                weight_12 = (r_old - r1) * (c2 - c_old),
-                weight_21 = (r2 - r_old) * (c_old - c1),
-                weight_22 = (r_old - r1) * (c_old - c1);
+          weight_12 = (r2 - r_old) * (c_old - c1),
+          weight_21 = (r_old - r1) * (c2 - c_old),
+          weight_22 = (r_old - r1) * (c_old - c1);
       // Handle edge conditions:
       if (fill_mode == kNearest) {
-       if (r1 < 0) {
-         r1 = 0;
-         if (r2 < 0) r2 = 0;
-       }
-       if (r2 >= width) {
-         r2 = width - 1;
-         if (r1 >= width) r1 = width - 1;
-       }
-       if (c1 < 0) {
-         c1 = 0;
-         if (c2 < 0) c2 = 0;
-       }
-       if (c2 >= height) {
-         c2 = height - 1;
-         if (c1 >= height) c1 = height - 1;
-       }
+        if (r1 < 0) {
+          r1 = 0;
+          if (r2 < 0) r2 = 0;
+        }
+        if (r2 >= width) {
+          r2 = width - 1;
+          if (r1 >= width) r1 = width - 1;
+        }
+        if (c1 < 0) {
+          c1 = 0;
+          if (c2 < 0) c2 = 0;
+        }
+        if (c2 >= height) {
+          c2 = height - 1;
+          if (c1 >= height) c1 = height - 1;
+        }
       } else {
-       KALDI_ASSERT(fill_mode == kReflect);
-       if (r1 < 0) {
-         r1 = - r1;
-         if (r2 < 0) r2 = - r2;
-       }
-       if (r2 >= width) {
-         r2 = 2 * width -2 - r2;
-         if (r1 >= width) r1 = 2 * width - 2 - r1;
-       }
-       if (c1 < 0) {
-         c1 = - c1;
-         if (c2 < 0) c2 = -c2;
-       }
-       if (c2 >= height) {
-         c2 = 2 * height - 2 - c2;
-         if (c1 >= height) c1 = 2 * height - 2 - c1;
-       }
+        KALDI_ASSERT(fill_mode == kReflect);
+        if (r1 < 0) {
+          r1 = - r1;
+          if (r2 < 0) r2 = - r2;
+        }
+        if (r2 >= width) {
+          r2 = 2 * width - 2 - r2;
+          if (r1 >= width) r1 = 2 * width - 2 - r1;
+        }
+        if (c1 < 0) {
+          c1 = - c1;
+          if (c2 < 0) c2 = -c2;
+        }
+        if (c2 >= height) {
+          c2 = 2 * height - 2 - c2;
+          if (c1 >= height) c1 = 2 * height - 2 - c1;
+        }
       }
       for (int32 ch = 0; ch < num_channels; ch++) {
         // find the values at the 4 points
         BaseFloat p11 = original_image(r1, num_channels * c1 + ch),
-                  p12 = original_image(r1, num_channels * c2 + ch),
-                  p21 = original_image(r2, num_channels * c1 + ch),
-                  p22 = original_image(r2, num_channels * c2 + ch);
+            p12 = original_image(r1, num_channels * c2 + ch),
+            p21 = original_image(r2, num_channels * c1 + ch),
+            p22 = original_image(r2, num_channels * c2 + ch);
         (*image)(r, num_channels * c + ch) = weight_11 * p11 + weight_12 * p12 +
-                                             weight_21 * p21 + weight_22 * p22;
+            weight_21 * p21 + weight_22 * p22;
       }
     }
   }
 }
 
 /**
-  This function randomly modifies (perturbs) the image by applying different
-  geometric transformations according to the options in 'config'.
-  References: "Digital Image Processing book by Gonzalez and Woods" and
-  "Keras: github.com/fchollet/keras/blob/master/keras/preprocessing/image.py"
-  @param [in] config  Configuration class that says how
-                      to perturb the image.
-  @param [in,out] image  The image matrix to be modified.
-                     image->NumRows() is the width (number of x values) in
-                     the image; image->NumCols() is the height times number
-                     of channels/colors (channel varies the fastest).
- */
+   This function randomly modifies (perturbs) the image by applying different
+   geometric transformations according to the options in 'config'.
+   References: "Digital Image Processing book by Gonzalez and Woods" and
+   "Keras: github.com/fchollet/keras/blob/master/keras/preprocessing/image.py"
+   @param [in] config  Configuration class that says how
+   to perturb the image.
+   @param [in,out] image  The image matrix to be modified.
+   image->NumRows() is the width (number of x values) in
+   the image; image->NumCols() is the height times number
+   of channels/colors (channel varies the fastest).
+*/
 void PerturbImage(const ImageAugmentationConfig &config,
                   MatrixBase<BaseFloat> *image) {
   config.Check();
   FillMode fill_mode = config.GetFillMode();
   int32 image_width = image->NumRows(),
-    num_channels = config.num_channels,
-    image_height = image->NumCols() / num_channels;
+      num_channels = config.num_channels,
+      image_height = image->NumCols() / num_channels;
   if (image->NumCols() % num_channels != 0) {
     KALDI_ERR << "Number of columns in image must divide the number "
         "of channels";
@@ -215,11 +215,11 @@ void PerturbImage(const ImageAugmentationConfig &config,
   //   0   1  y_shift
   //   0   0  1       ]
   BaseFloat horizontal_shift = (2.0 * RandUniform() - 1.0) *
-                               config.horizontal_shift * image_width;
+      config.horizontal_shift * image_width;
   BaseFloat vertical_shift = (2.0 * RandUniform() - 1.0) *
-                             config.vertical_shift * image_height;
+      config.vertical_shift * image_height;
   shift_mat(0, 2) = floor(horizontal_shift);  // best to floor the shifts to
-                                              // avoid unnecessary blurring
+  // avoid unnecessary blurring
   shift_mat(1, 2) = floor(vertical_shift);
   // since we will center the image before applying the transform,
   // horizontal flipping is simply achieved by setting [0, 0] to -1:
@@ -249,10 +249,10 @@ void PerturbImage(const ImageAugmentationConfig &config,
 
   // transform_mat = rotation_mat * shift_mat * shear_mat * zoom_mat:
   transform_mat.AddMatMat(1.0, shift_mat, kNoTrans,
-                               shear_mat, kNoTrans, 0.0);
+                          shear_mat, kNoTrans, 0.0);
   transform_mat.AddMatMatMat(1.0, rotation_mat, kNoTrans,
-                               transform_mat, kNoTrans,
-                               zoom_mat, kNoTrans, 0.0);
+                             transform_mat, kNoTrans,
+                             zoom_mat, kNoTrans, 0.0);
   if (transform_mat.IsUnit())  // nothing to do
     return;
 
@@ -271,8 +271,8 @@ void PerturbImage(const ImageAugmentationConfig &config,
 
   // transform_mat = set_origin_mat * transform_mat * reset_origin_mat
   transform_mat.AddMatMatMat(1.0, set_origin_mat, kNoTrans,
-                                  transform_mat, kNoTrans,
-                                  reset_origin_mat, kNoTrans, 0.0);
+                             transform_mat, kNoTrans,
+                             reset_origin_mat, kNoTrans, 0.0);
   ApplyAffineTransform(transform_mat, config.num_channels, image, fill_mode);
 }
 
@@ -281,7 +281,7 @@ void PerturbImage(const ImageAugmentationConfig &config,
    This function does image perturbation as directed by 'config'
    The example 'eg' is expected to contain a NnetIo member with the
    name 'input', representing an image.
- */
+*/
 void PerturbImageInNnetExample(
     const ImageAugmentationConfig &config,
     NnetExample *eg) {