File spandsp3.patch of Package librm
Index: librm-2.2.3/plugins/capi/fax.c
===================================================================
--- librm-2.2.3.orig/plugins/capi/fax.c
+++ librm-2.2.3/plugins/capi/fax.c
@@ -203,28 +203,28 @@ static void capi_fax_spandsp_init(const
/* Supported resolutions */
supported_resolutions = 0;
- supported_resolutions |= T30_SUPPORT_STANDARD_RESOLUTION;
- supported_resolutions |= T30_SUPPORT_FINE_RESOLUTION;
- supported_resolutions |= T30_SUPPORT_SUPERFINE_RESOLUTION;
- supported_resolutions |= T30_SUPPORT_R8_RESOLUTION;
- supported_resolutions |= T30_SUPPORT_R16_RESOLUTION;
- supported_resolutions |= T30_SUPPORT_300_300_RESOLUTION;
- supported_resolutions |= T30_SUPPORT_400_400_RESOLUTION;
- supported_resolutions |= T30_SUPPORT_600_600_RESOLUTION;
- supported_resolutions |= T30_SUPPORT_1200_1200_RESOLUTION;
- supported_resolutions |= T30_SUPPORT_300_600_RESOLUTION;
- supported_resolutions |= T30_SUPPORT_400_800_RESOLUTION;
- supported_resolutions |= T30_SUPPORT_600_1200_RESOLUTION;
+ supported_resolutions |= T4_RESOLUTION_R8_STANDARD;
+ supported_resolutions |= T4_RESOLUTION_R8_FINE;
+ supported_resolutions |= T4_RESOLUTION_R8_SUPERFINE;
+ supported_resolutions |= T4_RESOLUTION_200_200;
+ supported_resolutions |= T4_RESOLUTION_200_400;
+ supported_resolutions |= T4_RESOLUTION_300_300;
+ supported_resolutions |= T4_RESOLUTION_400_400;
+ supported_resolutions |= T4_RESOLUTION_600_600;
+ supported_resolutions |= T4_RESOLUTION_1200_1200;
+ supported_resolutions |= T4_RESOLUTION_300_600;
+ supported_resolutions |= T4_RESOLUTION_400_800;
+ supported_resolutions |= T4_RESOLUTION_600_1200;
/* Supported image sizes */
supported_image_sizes = 0;
- supported_image_sizes |= T30_SUPPORT_215MM_WIDTH;
- supported_image_sizes |= T30_SUPPORT_255MM_WIDTH;
- supported_image_sizes |= T30_SUPPORT_303MM_WIDTH;
- supported_image_sizes |= T30_SUPPORT_UNLIMITED_LENGTH;
- supported_image_sizes |= T30_SUPPORT_A4_LENGTH;
- supported_image_sizes |= T30_SUPPORT_US_LETTER_LENGTH;
- supported_image_sizes |= T30_SUPPORT_US_LEGAL_LENGTH;
+ supported_image_sizes |= T4_SUPPORT_WIDTH_215MM;
+ supported_image_sizes |= T4_SUPPORT_WIDTH_255MM;
+ supported_image_sizes |= T4_SUPPORT_WIDTH_303MM;
+ supported_image_sizes |= T4_SUPPORT_LENGTH_UNLIMITED;
+ supported_image_sizes |= T4_SUPPORT_LENGTH_A4;
+ supported_image_sizes |= T4_SUPPORT_LENGTH_US_LETTER;
+ supported_image_sizes |= T4_SUPPORT_LENGTH_US_LEGAL;
/* Supported modems */
supported_modems = 0;
@@ -246,9 +246,9 @@ static void capi_fax_spandsp_init(const
if (ecm) {
/* Supported compressions */
#if defined(SPANDSP_SUPPORT_T85)
- t30_set_supported_compressions(t30, T30_SUPPORT_T4_1D_COMPRESSION | T30_SUPPORT_T4_2D_COMPRESSION | T30_SUPPORT_T6_COMPRESSION | T30_SUPPORT_T85_COMPRESSION);
+ t30_set_supported_compressions(t30, T4_COMPRESSION_T4_1D | T4_COMPRESSION_T4_2D | T4_COMPRESSION_T6 | T4_COMPRESSION_T85);
#else
- t30_set_supported_compressions(t30, T30_SUPPORT_T4_1D_COMPRESSION | T30_SUPPORT_T4_2D_COMPRESSION | T30_SUPPORT_T6_COMPRESSION);
+ t30_set_supported_compressions(t30, T4_COMPRESSION_T4_1D | T4_COMPRESSION_T4_2D | T4_COMPRESSION_T6);
#endif
t30_set_ecm_capability(t30, ecm);