From ffcf6443f0f44f06e25c1c696cd67420e4c08364 Mon Sep 17 00:00:00 2001
From: Steve Underwood <steveu@coppice.org>
Date: Wed, 8 Aug 2012 21:16:38 +0800
Subject: [PATCH] Tweaks
---
libs/spandsp/src/spandsp/private/t4_rx.h | 2 --
libs/spandsp/src/spandsp/private/t4_tx.h | 2 --
libs/spandsp/src/t4_rx.c | 18 ------------------
libs/spandsp/src/t4_tx.c | 18 ------------------
4 files changed, 40 deletions(-)
diff --git a/libs/spandsp/src/spandsp/private/t4_rx.h b/libs/spandsp/src/spandsp/private/t4_rx.h
index 4dc2b21e21..44eb2d2664 100644
--- a/libs/spandsp/src/spandsp/private/t4_rx.h
+++ b/libs/spandsp/src/spandsp/private/t4_rx.h
@@ -109,9 +109,7 @@ struct t4_rx_state_s
union
{
t4_t6_decode_state_t t4_t6;
-#if defined(SPANDSP_SUPPORT_T42)
t42_decode_state_t t42;
-#endif
#if defined(SPANDSP_SUPPORT_T43)
t43_decode_state_t t43;
#endif
diff --git a/libs/spandsp/src/spandsp/private/t4_tx.h b/libs/spandsp/src/spandsp/private/t4_tx.h
index 9f4bf463be..360315a9d2 100644
--- a/libs/spandsp/src/spandsp/private/t4_tx.h
+++ b/libs/spandsp/src/spandsp/private/t4_tx.h
@@ -133,9 +133,7 @@ struct t4_tx_state_s
union
{
t4_t6_encode_state_t t4_t6;
-#if defined(SPANDSP_SUPPORT_T42)
t42_encode_state_t t42;
-#endif
#if defined(SPANDSP_SUPPORT_T43)
t43_encode_state_t t43;
#endif
diff --git a/libs/spandsp/src/t4_rx.c b/libs/spandsp/src/t4_rx.c
index 7de952b890..c152d31871 100644
--- a/libs/spandsp/src/t4_rx.c
+++ b/libs/spandsp/src/t4_rx.c
@@ -253,11 +253,9 @@ static int set_tiff_directory_info(t4_rx_state_t *s)
case T4_COMPRESSION_ITU_T6:
TIFFSetField(t->tiff_file, TIFFTAG_IMAGELENGTH, t4_t6_decode_get_image_length(&s->decoder.t4_t6));
break;
-#if defined(SPANDSP_SUPPORT_T42)
case T4_COMPRESSION_ITU_T42:
TIFFSetField(t->tiff_file, TIFFTAG_IMAGELENGTH, t42_decode_get_image_length(&s->decoder.t42));
break;
-#endif
#if defined(SPANDSP_SUPPORT_T43)
case T4_COMPRESSION_ITU_T43:
TIFFSetField(t->tiff_file, TIFFTAG_IMAGELENGTH, t43_decode_get_image_length(&s->decoder.t43));
@@ -360,10 +358,8 @@ SPAN_DECLARE(int) t4_rx_put_byte(t4_rx_state_t *s, uint8_t byte)
case T4_COMPRESSION_ITU_T4_2D:
case T4_COMPRESSION_ITU_T6:
return t4_t6_decode_put_byte(&s->decoder.t4_t6, byte);
-#if defined(SPANDSP_SUPPORT_T42)
case T4_COMPRESSION_ITU_T42:
return t42_decode_put_byte(&s->decoder.t42, byte);
-#endif
#if defined(SPANDSP_SUPPORT_T43)
case T4_COMPRESSION_ITU_T43:
return t43_decode_put_byte(&s->decoder.t43, byte);
@@ -385,10 +381,8 @@ SPAN_DECLARE(int) t4_rx_put_chunk(t4_rx_state_t *s, const uint8_t buf[], int len
case T4_COMPRESSION_ITU_T4_2D:
case T4_COMPRESSION_ITU_T6:
return t4_t6_decode_put_chunk(&s->decoder.t4_t6, buf, len);
-#if defined(SPANDSP_SUPPORT_T42)
case T4_COMPRESSION_ITU_T42:
return t42_decode_put_chunk(&s->decoder.t42, buf, len);
-#endif
#if defined(SPANDSP_SUPPORT_T43)
case T4_COMPRESSION_ITU_T43:
return t43_decode_put_chunk(&s->decoder.t43, buf, len);
@@ -462,7 +456,6 @@ SPAN_DECLARE(int) t4_rx_set_rx_encoding(t4_rx_state_t *s, int encoding)
}
s->line_encoding = encoding;
return t4_t6_decode_set_encoding(&s->decoder.t4_t6, encoding);
-#if defined(SPANDSP_SUPPORT_T42)
case T4_COMPRESSION_ITU_T42:
switch (s->line_encoding)
{
@@ -478,7 +471,6 @@ SPAN_DECLARE(int) t4_rx_set_rx_encoding(t4_rx_state_t *s, int encoding)
}
s->line_encoding = encoding;
return 0;
-#endif
#if defined(SPANDSP_SUPPORT_T43)
case T4_COMPRESSION_ITU_T43:
switch (s->line_encoding)
@@ -534,10 +526,8 @@ SPAN_DECLARE(int) t4_rx_set_row_write_handler(t4_rx_state_t *s, t4_row_write_han
case T4_COMPRESSION_ITU_T4_2D:
case T4_COMPRESSION_ITU_T6:
return t4_t6_decode_set_row_write_handler(&s->decoder.t4_t6, handler, user_data);
-#if defined(SPANDSP_SUPPORT_T42)
case T4_COMPRESSION_ITU_T42:
return t42_decode_set_row_write_handler(&s->decoder.t42, handler, user_data);
-#endif
#if defined(SPANDSP_SUPPORT_T43)
case T4_COMPRESSION_ITU_T43:
return t43_decode_set_row_write_handler(&s->decoder.t43, handler, user_data);
@@ -569,13 +559,11 @@ SPAN_DECLARE(void) t4_rx_get_transfer_statistics(t4_rx_state_t *s, t4_stats_t *t
t->bad_rows = s->decoder.t4_t6.bad_rows;
t->longest_bad_row_run = s->decoder.t4_t6.longest_bad_row_run;
break;
-#if defined(SPANDSP_SUPPORT_T42)
case T4_COMPRESSION_ITU_T42:
t->width = t42_decode_get_image_width(&s->decoder.t42);
t->length = t42_decode_get_image_length(&s->decoder.t42);
t->line_image_size = t42_decode_get_compressed_image_size(&s->decoder.t42)/8;
break;
-#endif
#if defined(SPANDSP_SUPPORT_T43)
case T4_COMPRESSION_ITU_T43:
t->width = t43_decode_get_image_width(&s->decoder.t43);
@@ -604,11 +592,9 @@ SPAN_DECLARE(int) t4_rx_start_page(t4_rx_state_t *s)
case T4_COMPRESSION_ITU_T6:
t4_t6_decode_restart(&s->decoder.t4_t6, s->image_width);
break;
-#if defined(SPANDSP_SUPPORT_T42)
case T4_COMPRESSION_ITU_T42:
t42_decode_restart(&s->decoder.t42);
break;
-#endif
#if defined(SPANDSP_SUPPORT_T43)
case T4_COMPRESSION_ITU_T43:
t43_decode_restart(&s->decoder.t43);
@@ -663,12 +649,10 @@ SPAN_DECLARE(int) t4_rx_end_page(t4_rx_state_t *s)
t4_t6_decode_put_byte(&s->decoder.t4_t6, SIG_STATUS_END_OF_DATA);
length = t4_t6_decode_get_image_length(&s->decoder.t4_t6);
break;
-#if defined(SPANDSP_SUPPORT_T42)
case T4_COMPRESSION_ITU_T42:
t42_decode_put_byte(&s->decoder.t42, SIG_STATUS_END_OF_DATA);
length = t42_decode_get_image_length(&s->decoder.t42);
break;
-#endif
#if defined(SPANDSP_SUPPORT_T43)
case T4_COMPRESSION_ITU_T43:
t43_decode_put_byte(&s->decoder.t43, SIG_STATUS_END_OF_DATA);
@@ -759,10 +743,8 @@ SPAN_DECLARE(int) t4_rx_release(t4_rx_state_t *s)
case T4_COMPRESSION_ITU_T4_2D:
case T4_COMPRESSION_ITU_T6:
return t4_t6_decode_release(&s->decoder.t4_t6);
-#if defined(SPANDSP_SUPPORT_T42)
case T4_COMPRESSION_ITU_T42:
return t42_decode_release(&s->decoder.t42);
-#endif
#if defined(SPANDSP_SUPPORT_T43)
case T4_COMPRESSION_ITU_T43:
return t43_decode_release(&s->decoder.t43);
diff --git a/libs/spandsp/src/t4_tx.c b/libs/spandsp/src/t4_tx.c
index 17c832ecf5..49f059e89c 100644
--- a/libs/spandsp/src/t4_tx.c
+++ b/libs/spandsp/src/t4_tx.c
@@ -524,10 +524,8 @@ static int set_row_read_handler(t4_tx_state_t *s, t4_row_read_handler_t handler,
case T4_COMPRESSION_ITU_T4_2D:
case T4_COMPRESSION_ITU_T6:
return t4_t6_encode_set_row_read_handler(&s->encoder.t4_t6, handler, user_data);
-#if defined(SPANDSP_SUPPORT_T42)
case T4_COMPRESSION_ITU_T42:
return t42_encode_set_row_read_handler(&s->encoder.t42, handler, user_data);
-#endif
#if defined(SPANDSP_SUPPORT_T43)
case T4_COMPRESSION_ITU_T43:
return t43_encode_set_row_read_handler(&s->encoder.t43, handler, user_data);
@@ -686,7 +684,6 @@ SPAN_DECLARE(int) t4_tx_set_tx_encoding(t4_tx_state_t *s, int encoding)
}
s->line_encoding = encoding;
return t4_t6_encode_set_encoding(&s->encoder.t4_t6, encoding);
-#if defined(SPANDSP_SUPPORT_T42)
case T4_COMPRESSION_ITU_T42:
switch (s->line_encoding)
{
@@ -698,7 +695,6 @@ SPAN_DECLARE(int) t4_tx_set_tx_encoding(t4_tx_state_t *s, int encoding)
}
s->line_encoding = encoding;
return 0;
-#endif
#if defined(SPANDSP_SUPPORT_T43)
case T4_COMPRESSION_ITU_T43:
switch (s->line_encoding)
@@ -753,11 +749,9 @@ SPAN_DECLARE(void) t4_tx_set_image_width(t4_tx_state_t *s, int image_width)
case T4_COMPRESSION_ITU_T6:
t4_t6_encode_set_image_width(&s->encoder.t4_t6, image_width);
break;
-#if defined(SPANDSP_SUPPORT_T42)
case T4_COMPRESSION_ITU_T42:
t42_encode_set_image_width(&s->encoder.t42, image_width);
break;
-#endif
#if defined(SPANDSP_SUPPORT_T43)
case T4_COMPRESSION_ITU_T43:
t43_encode_set_image_width(&s->encoder.t43, image_width);
@@ -776,11 +770,9 @@ static void t4_tx_set_image_length(t4_tx_state_t *s, int image_length)
s->image_length = image_length;
switch (s->line_encoding)
{
-#if defined(SPANDSP_SUPPORT_T42)
case T4_COMPRESSION_ITU_T42:
t42_encode_set_image_length(&s->encoder.t42, image_length);
break;
-#endif
#if defined(SPANDSP_SUPPORT_T43)
case T4_COMPRESSION_ITU_T43:
t43_encode_set_image_length(&s->encoder.t43, image_length);
@@ -886,13 +878,11 @@ SPAN_DECLARE(void) t4_tx_get_transfer_statistics(t4_tx_state_t *s, t4_stats_t *t
t->length = t4_t6_encode_get_image_length(&s->encoder.t4_t6);
t->line_image_size = t4_t6_encode_get_compressed_image_size(&s->encoder.t4_t6)/8;
break;
-#if defined(SPANDSP_SUPPORT_T42)
case T4_COMPRESSION_ITU_T42:
t->width = t42_encode_get_image_width(&s->encoder.t42);
t->length = t42_encode_get_image_length(&s->encoder.t42);
t->line_image_size = t42_encode_get_compressed_image_size(&s->encoder.t42)/8;
break;
-#endif
#if defined(SPANDSP_SUPPORT_T43)
case T4_COMPRESSION_ITU_T43:
t->width = t43_encode_get_image_width(&s->encoder.t43);
@@ -930,10 +920,8 @@ SPAN_DECLARE(int) t4_tx_get_byte(t4_tx_state_t *s)
case T4_COMPRESSION_ITU_T4_2D:
case T4_COMPRESSION_ITU_T6:
return t4_t6_encode_get_byte(&s->encoder.t4_t6);
-#if defined(SPANDSP_SUPPORT_T42)
case T4_COMPRESSION_ITU_T42:
return t42_encode_get_byte(&s->encoder.t42);
-#endif
#if defined(SPANDSP_SUPPORT_T43)
case T4_COMPRESSION_ITU_T43:
return t43_encode_get_byte(&s->encoder.t43);
@@ -954,10 +942,8 @@ SPAN_DECLARE(int) t4_tx_get_chunk(t4_tx_state_t *s, uint8_t buf[], int max_len)
case T4_COMPRESSION_ITU_T4_2D:
case T4_COMPRESSION_ITU_T6:
return t4_t6_encode_get_chunk(&s->encoder.t4_t6, buf, max_len);
-#if defined(SPANDSP_SUPPORT_T42)
case T4_COMPRESSION_ITU_T42:
return t42_encode_get_chunk(&s->encoder.t42, buf, max_len);
-#endif
#if defined(SPANDSP_SUPPORT_T43)
case T4_COMPRESSION_ITU_T43:
return t43_encode_get_chunk(&s->encoder.t43, buf, max_len);
@@ -995,11 +981,9 @@ SPAN_DECLARE(int) t4_tx_start_page(t4_tx_state_t *s)
case T4_COMPRESSION_ITU_T6:
t4_t6_encode_restart(&s->encoder.t4_t6, s->image_width);
break;
-#if defined(SPANDSP_SUPPORT_T42)
case T4_COMPRESSION_ITU_T42:
t42_encode_restart(&s->encoder.t42, s->image_width, s->image_length);
break;
-#endif
#if defined(SPANDSP_SUPPORT_T43)
case T4_COMPRESSION_ITU_T43:
t43_encode_restart(&s->encoder.t43, s->image_width, s->image_length);
@@ -1106,10 +1090,8 @@ SPAN_DECLARE(int) t4_tx_release(t4_tx_state_t *s)
case T4_COMPRESSION_ITU_T4_2D:
case T4_COMPRESSION_ITU_T6:
return t4_t6_encode_release(&s->encoder.t4_t6);
-#if defined(SPANDSP_SUPPORT_T42)
case T4_COMPRESSION_ITU_T42:
return t42_encode_release(&s->encoder.t42);
-#endif
#if defined(SPANDSP_SUPPORT_T43)
case T4_COMPRESSION_ITU_T43:
return t43_encode_release(&s->encoder.t43);