Commit: e6aefa60383d5d2eabd2af94452a992101336ae0 - xinput_calibrator (git)

A generic touchscreen calibration program for X.Org

Commit MetaInfo

• Révision: e6aefa60383d5d2eabd2af94452a992101336ae0 (tree)
• l'heure: 2014-02-13 17:38:26
• Auteur: Christian Gmeiner <christian.gmeiner@gmai...>
• Commiter: Christian Gmeiner

Message de Log

pass function parameter 'new_axys' by reference

Signed-off-by: Christian Gmeiner <[e-mail]>

Change Summary

• modified: src/calibrator.hh
• modified: src/calibrator/Evdev.cpp
• modified: src/calibrator/Evdev.hpp
• modified: src/calibrator/EvdevTester.cpp
• modified: src/calibrator/EvdevTester.hpp
• modified: src/calibrator/Tester.cpp
• modified: src/calibrator/Tester.hpp
• modified: src/calibrator/Usbtouchscreen.cpp
• modified: src/calibrator/Usbtouchscreen.hpp
• modified: src/calibrator/XorgPrint.cpp
• modified: src/calibrator/XorgPrint.hpp

Modification

--- a/src/calibrator.hh
+++ b/src/calibrator.hh
@@ -193,7 +193,7 @@ protected:
     bool along_axis(int xy, int x0, int y0);
 
     /// Apply new calibration, implementation dependent
-    virtual bool finish_data(const XYinfo new_axys) =0;
+    virtual bool finish_data(const XYinfo &new_axys) =0;
 
     /// Check whether the given name is a sysfs device name
     bool is_sysfs_name(const char* name);

--- a/src/calibrator/Evdev.cpp
+++ b/src/calibrator/Evdev.cpp
@@ -258,7 +258,7 @@ bool CalibratorEvdev::finish(int width, int height)
 }
 
 // Activate calibrated data and output it
-bool CalibratorEvdev::finish_data(const XYinfo new_axys)
+bool CalibratorEvdev::finish_data(const XYinfo &new_axys)
 {
     bool success = true;
 

--- a/src/calibrator/Evdev.hpp
+++ b/src/calibrator/Evdev.hpp
@@ -64,7 +64,7 @@ public:
 
     /// calculate and apply the calibration
     virtual bool finish(int width, int height);
-    virtual bool finish_data(const XYinfo new_axys);
+    virtual bool finish_data(const XYinfo &new_axys);
 
     bool set_swapxy(const int swap_xy);
     bool set_invert_xy(const int invert_x, const int invert_y);

--- a/src/calibrator/EvdevTester.cpp
+++ b/src/calibrator/EvdevTester.cpp
@@ -31,7 +31,7 @@ CalibratorEvdevTester::CalibratorEvdevTester(const char* const device_name0, con
     //printf("Starting test driver\n");
 }
 
-bool CalibratorEvdevTester::finish_data(const XYinfo axis)
+bool CalibratorEvdevTester::finish_data(const XYinfo &axis)
 {
     new_axis = axis;
 

--- a/src/calibrator/EvdevTester.hpp
+++ b/src/calibrator/EvdevTester.hpp
@@ -41,7 +41,7 @@ public:
         const int thr_misclick=0, const int thr_doubleclick=0,
         const OutputType output_type=OUTYPE_AUTO, const char* geometry=0);
 
-    virtual bool finish_data(const XYinfo new_axis);
+    virtual bool finish_data(const XYinfo &new_axis);
 
     // emulate the driver processing the coordinates in 'raw'
     virtual XYinfo emulate_driver(const XYinfo& raw, bool useNewAxis, const XYinfo& screen, const XYinfo& device);

--- a/src/calibrator/Tester.cpp
+++ b/src/calibrator/Tester.cpp
@@ -30,7 +30,7 @@ CalibratorTester::CalibratorTester(const char* const device_name0, const XYinfo&
     //printf("Starting test driver\n");
 }
 
-bool CalibratorTester::finish_data(const XYinfo axis)
+bool CalibratorTester::finish_data(const XYinfo &axis)
 {
     new_axis = axis;
 

--- a/src/calibrator/Tester.hpp
+++ b/src/calibrator/Tester.hpp
@@ -40,7 +40,7 @@ public:
         const int thr_misclick=0, const int thr_doubleclick=0,
         const OutputType output_type=OUTYPE_AUTO, const char* geometry=0);
 
-    virtual bool finish_data(const XYinfo new_axis);
+    virtual bool finish_data(const XYinfo &new_axis);
 
     // emulate the driver processing the coordinates in 'raw'
     virtual XYinfo emulate_driver(const XYinfo& raw,

--- a/src/calibrator/Usbtouchscreen.cpp
+++ b/src/calibrator/Usbtouchscreen.cpp
@@ -77,7 +77,7 @@ CalibratorUsbtouchscreen::~CalibratorUsbtouchscreen()
     write_bool_parameter (p_swap_xy, val_swap_xy);
 }
 
-bool CalibratorUsbtouchscreen::finish_data(const XYinfo new_axys)
+bool CalibratorUsbtouchscreen::finish_data(const XYinfo &new_axys)
 {
     if (output_type != OUTYPE_AUTO) {
         fprintf(stderr, "ERROR: Usbtouchscreen Calibrator does not support the supplied --output-type\n");

--- a/src/calibrator/Usbtouchscreen.hpp
+++ b/src/calibrator/Usbtouchscreen.hpp
@@ -38,7 +38,7 @@ public:
         const bool use_timeout=false, const char* output_filename = 0);
     virtual ~CalibratorUsbtouchscreen();
 
-    virtual bool finish_data(const XYinfo new_axys);
+    virtual bool finish_data(const XYinfo &new_axys);
 
 protected:
     // Globals for kernel parameters from startup.

--- a/src/calibrator/XorgPrint.cpp
+++ b/src/calibrator/XorgPrint.cpp
@@ -33,7 +33,7 @@ CalibratorXorgPrint::CalibratorXorgPrint(const char* const device_name0, const X
     printf("\tIf these values are estimated wrong, either supply it manually with the --precalib option, or run the 'get_precalib.sh' script to automatically get it (through HAL).\n");
 }
 
-bool CalibratorXorgPrint::finish_data(const XYinfo new_axys)
+bool CalibratorXorgPrint::finish_data(const XYinfo &new_axys)
 {
     bool success = true;
 

--- a/src/calibrator/XorgPrint.hpp
+++ b/src/calibrator/XorgPrint.hpp
@@ -37,7 +37,7 @@ public:
         const OutputType output_type=OUTYPE_AUTO, const char* geometry=0,
         const bool use_timeout=false, const char* output_filename = 0);
 
-    virtual bool finish_data(const XYinfo new_axys);
+    virtual bool finish_data(const XYinfo &new_axys);
 
 protected:
     bool output_xorgconfd(const XYinfo new_axys);