rename converter methods

diff --git a/src/kds_s2000w_pixel_converter.c b/src/kds_s2000w_pixel_converter.c
index e97d5db6e40efb73926fe0e506d42b1fa14c15b6..7b5717e4b1f2b4e6cece856d9c4b020cc3177e7d 100644 (file)
--- a/src/kds_s2000w_pixel_converter.c
+++ b/src/kds_s2000w_pixel_converter.c
@@ -2,12 +2,12 @@
 
 #define TENTH 10
 
-uint32_t kds_s2000w_pixel_converter_pixel_to_tenth_of_inch(uint32_t dpi, uint32_t pixel)
+uint32_t kds_s2000w_pixel_converter_pixel_to_tenth_inch(uint32_t dpi, uint32_t pixel)
 {
        return pixel * TENTH / dpi;
 }
 
-uint32_t kds_s2000w_pixel_converter_tenth_of_inch_to_pixel(uint32_t dpi, uint32_t tenth_inch)
+uint32_t kds_s2000w_pixel_converter_tenth_inch_to_pixel(uint32_t dpi, uint32_t tenth_inch)
 {
        return tenth_inch * dpi / TENTH;
 }
\ No newline at end of file

diff --git a/src/kds_s2000w_pixel_converter.h b/src/kds_s2000w_pixel_converter.h
index 374f8e3f9594f834344b2eafec8de55cf21cf9de..5586723aa0ed94b236050bde76a676568ab337f6 100644 (file)
--- a/src/kds_s2000w_pixel_converter.h
+++ b/src/kds_s2000w_pixel_converter.h
@@ -2,7 +2,7 @@
 #define KDS_S2000W_PIXEL_CONVERTER_H
 #include <stdint.h>
 
-uint32_t kds_s2000w_pixel_converter_pixel_to_tenth_of_inch(uint32_t dpi, uint32_t pixel);
-uint32_t kds_s2000w_pixel_converter_tenth_of_inch_to_pixel(uint32_t dpi, uint32_t tenth_inch);
+uint32_t kds_s2000w_pixel_converter_pixel_to_tenth_inch(uint32_t dpi, uint32_t pixel);
+uint32_t kds_s2000w_pixel_converter_tenth_inch_to_pixel(uint32_t dpi, uint32_t tenth_inch);
 
 #endif
\ No newline at end of file

diff --git a/tests/kds_s2000w_pixel_converter_tests.c b/tests/kds_s2000w_pixel_converter_tests.c
index 43afee402abb32f9e0b621a11e6768b38fdc46d3..49c34e0bf666accf1b45c3c59f34a7c99b12a438 100644 (file)
--- a/tests/kds_s2000w_pixel_converter_tests.c
+++ b/tests/kds_s2000w_pixel_converter_tests.c
@@ -10,17 +10,17 @@ void kds_s2000w_max_tl_x_pixel_to_tenth_inch_test()
        uint32_t dpi = 300;
        uint32_t pixel = 2250;
 
-       uint32_t tenth_inch = kds_s2000w_pixel_converter_pixel_to_tenth_of_inch(dpi, pixel);
+       uint32_t tenth_inch = kds_s2000w_pixel_converter_pixel_to_tenth_inch(dpi, pixel);
 
        assert_int_equal(tenth_inch, 75);
 }
 
-void kds_s2000w_max_tl_x_tenth_of_inch_to_pixel_test()
+void kds_s2000w_max_tl_x_tenth_inch_to_pixel_test()
 {
        uint32_t dpi = 300;
        uint32_t tenth_inch = 75;
 
-       uint32_t pixel = kds_s2000w_pixel_converter_tenth_of_inch_to_pixel(dpi, tenth_inch);
+       uint32_t pixel = kds_s2000w_pixel_converter_tenth_inch_to_pixel(dpi, tenth_inch);
 
        assert_int_equal(pixel, 2250);
 }
@@ -29,7 +29,7 @@ int main()
 {
        const struct CMUnitTest tests[] = {
                cmocka_unit_test(kds_s2000w_max_tl_x_pixel_to_tenth_inch_test),
-               cmocka_unit_test(kds_s2000w_max_tl_x_tenth_of_inch_to_pixel_test)
+               cmocka_unit_test(kds_s2000w_max_tl_x_tenth_inch_to_pixel_test)
        };
 
        return cmocka_run_group_tests(tests, NULL, NULL);