Cleanup of some T.4 functions which are obsolete

diff --git a/libs/spandsp/src/spandsp/t4_tx.h b/libs/spandsp/src/spandsp/t4_tx.h
index 7a28f89c02f1b618000f2d0a41c67c199dd974eb..b411892c786126554223136eefb4c1cedde9640b 100644 (file)
--- a/libs/spandsp/src/spandsp/t4_tx.h
+++ b/libs/spandsp/src/spandsp/t4_tx.h
@@ -387,31 +387,6 @@ SPAN_DECLARE(int) t4_tx_set_row_read_handler(t4_tx_state_t *s, t4_row_read_handl
     \param row_squashing_ratio Vertical squashing ratio. */
 SPAN_DECLARE(void) t4_tx_set_row_squashing_ratio(t4_tx_state_t *s, int row_squashing_ratio);
 
-/*! \brief Get the row-to-row (y) resolution of the current page.
-    \param s The T.4 context.
-    \return The resolution, in pixels per metre. */
-SPAN_DECLARE(int) t4_tx_get_y_resolution(t4_tx_state_t *s);
-
-/*! \brief Get the column-to-column (x) resolution of the current page.
-    \param s The T.4 context.
-    \return The resolution, in pixels per metre. */
-SPAN_DECLARE(int) t4_tx_get_x_resolution(t4_tx_state_t *s);
-
-/*! \brief Get the X and Y resolution code of the current page.
-    \param s The T.4 context.
-    \return The resolution code,. */
-SPAN_DECLARE(int) t4_tx_get_resolution(t4_tx_state_t *s);
-
-/*! \brief Get the width of the current page, in pixel columns.
-    \param s The T.4 context.
-    \return The number of columns. */
-SPAN_DECLARE(int) t4_tx_get_image_width(t4_tx_state_t *s);
-
-/*! \brief Get the type of the current page, in pixel columns.
-    \param s The T.4 context.
-    \return The type. */
-SPAN_DECLARE(int) t4_tx_get_image_type(t4_tx_state_t *s);
-
 /*! \brief Get the number of pages in the file.
     \param s The T.4 context.
     \return The number of pages, or -1 if there is an error. */

diff --git a/libs/spandsp/src/t4_tx.c b/libs/spandsp/src/t4_tx.c
index d0001aa7201d2e23d663651c3d7d189d4ae9619d..83eca0253a6c916dd29fc4302f8f577bb57c5695 100644 (file)
--- a/libs/spandsp/src/t4_tx.c
+++ b/libs/spandsp/src/t4_tx.c
@@ -1337,12 +1337,6 @@ SPAN_DECLARE(void) t4_tx_set_max_2d_rows_per_1d_row(t4_tx_state_t *s, int max)
 }
 /*- End of function --------------------------------------------------------*/
 
-SPAN_DECLARE(int) t4_tx_get_image_width(t4_tx_state_t *s)
-{
-    return s->metadata.image_width;
-}
-/*- End of function --------------------------------------------------------*/
-
 SPAN_DECLARE(void) t4_tx_set_header_overlays_image(t4_tx_state_t *s, int header_overlays_image)
 {
     s->header_overlays_image = header_overlays_image;
@@ -1367,30 +1361,6 @@ SPAN_DECLARE(void) t4_tx_set_header_tz(t4_tx_state_t *s, struct tz_s *tz)
 }
 /*- End of function --------------------------------------------------------*/
 
-SPAN_DECLARE(int) t4_tx_get_y_resolution(t4_tx_state_t *s)
-{
-    return s->metadata.y_resolution;
-}
-/*- End of function --------------------------------------------------------*/
-
-SPAN_DECLARE(int) t4_tx_get_x_resolution(t4_tx_state_t *s)
-{
-    return s->metadata.x_resolution;
-}
-/*- End of function --------------------------------------------------------*/
-
-SPAN_DECLARE(int) t4_tx_get_resolution(t4_tx_state_t *s)
-{
-    return s->metadata.resolution_code;
-}
-/*- End of function --------------------------------------------------------*/
-
-SPAN_DECLARE(int) t4_tx_get_image_type(t4_tx_state_t *s)
-{
-    return s->metadata.image_type;
-}
-/*- End of function --------------------------------------------------------*/
-
 SPAN_DECLARE(int) t4_tx_get_pages_in_file(t4_tx_state_t *s)
 {
     int max;

diff --git a/libs/spandsp/tests/t4_tests.c b/libs/spandsp/tests/t4_tests.c
index 2d4eba4ab2bda6d4ab23d0f16045047ca6555c7f..ac682bd620f3d648ed848a568e5fe548c6d715cf 100644 (file)
--- a/libs/spandsp/tests/t4_tests.c
+++ b/libs/spandsp/tests/t4_tests.c
@@ -554,9 +554,9 @@ int main(int argc, char *argv[])
 
                 if (t4_tx_start_page(send_state))
                     break;
-                t4_rx_set_x_resolution(receive_state, t4_tx_get_x_resolution(send_state));
-                t4_rx_set_y_resolution(receive_state, t4_tx_get_y_resolution(send_state));
-                t4_rx_set_image_width(receive_state, t4_tx_get_image_width(send_state));
+                t4_rx_set_x_resolution(receive_state, t4_tx_get_tx_x_resolution(send_state));
+                t4_rx_set_y_resolution(receive_state, t4_tx_get_tx_y_resolution(send_state));
+                t4_rx_set_image_width(receive_state, t4_tx_get_tx_image_width(send_state));
             }
             t4_rx_start_page(receive_state);
             detect_non_ecm_page_end(-1, compression);