commit a0549832a255a3124a465cdd5aecb68945644234
author Jean-Baptiste Queru <jbq@google.com> Fri Aug 24 07:30:02 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri Aug 24 07:30:02 2012 -0700
tree 3aef4cd6aa071bada11796b8b38774ca85c7dd29
parent a51a5f1faff0812ed759411542fe15551000582d
parent b67462baf584a595239b723d861a4eb0be67a4c3

am b67462ba: am 7c639089: Merge "Fixed variable declaration with empty parentheses."

* commit 'b67462baf584a595239b723d861a4eb0be67a4c3':
  Fixed variable declaration with empty parentheses.

apps/CtsVerifier/include/colorchecker/vec2.h

diff --git a/apps/CtsVerifier/include/colorchecker/vec2.h b/apps/CtsVerifier/include/colorchecker/vec2.h
index 9de614c..e58255d 100644
--- a/apps/CtsVerifier/include/colorchecker/vec2.h
+++ b/apps/CtsVerifier/include/colorchecker/vec2.h
@@ -41,12 +41,9 @@
     }
 
     inline Vec2<float> operator/ (const int param) const {
-        Vec2<float> temp();
         assert(param != 0);
-        temp.set(static_cast<float>(mX) / static_cast<float>(param),
-                 static_cast<float>(mY) / static_cast<float>(param));
-
-        return temp;
+        return Vec2<float>(static_cast<float>(mX) / static_cast<float>(param),
+                           static_cast<float>(mY) / static_cast<float>(param));
     }
 
     template <class U>