From 5fe8beac4233f54499bc3fa095b52433c0a55ca4 Mon Sep 17 00:00:00 2001
From: Alexey Spizhevoy <no@email>
Date: Wed, 18 May 2011 07:15:12 +0000
Subject: [PATCH] minor refactoring in opencv_stitching

---
 modules/stitching/motion_estimators.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/stitching/motion_estimators.cpp b/modules/stitching/motion_estimators.cpp
index 4f95e5222..bdfdf15d5 100644
--- a/modules/stitching/motion_estimators.cpp
+++ b/modules/stitching/motion_estimators.cpp
@@ -254,12 +254,12 @@ void BundleAdjuster::calcError(Mat &err)
             if (!matches_info.inliers_mask[k])
                 continue;
 
-            const DMatch& r = matches_info.matches[k];
+            const DMatch& m = matches_info.matches[k];
 
-            Point2d kp1 = features1.keypoints[r.queryIdx].pt;
+            Point2d kp1 = features1.keypoints[m.queryIdx].pt;
             kp1.x -= 0.5 * images_[i].cols;
             kp1.y -= 0.5 * images_[i].rows;
-            Point2d kp2 = features2.keypoints[r.trainIdx].pt;
+            Point2d kp2 = features2.keypoints[m.trainIdx].pt;
             kp2.x -= 0.5 * images_[j].cols;
             kp2.y -= 0.5 * images_[j].rows;
             double len1 = sqrt(kp1.x * kp1.x + kp1.y * kp1.y + f1 * f1);