kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-02-07 22:03:50 +00:00
Code Issues Projects Releases Wiki Activity

Corrected data type for TIFF directory offsets

Browse Source
This commit is contained in:
Steve Underwood 2014-05-07 02:28:27 +08:00
parent d6fe10979d
commit 9464549eb6
3 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libs/spandsp/src/t4_rx.c
View File

@ -616,7 +616,7 @@ static int write_tiff_image(t4_rx_state_t *s)
{ {
t4_rx_tiff_state_t *t; t4_rx_tiff_state_t *t;
#if defined(SPANDSP_SUPPORT_TIFF_FX) #if defined(SPANDSP_SUPPORT_TIFF_FX)
uint64_t offset; toff_t diroff;
#endif #endif
t = &s->tiff; t = &s->tiff;
@ -686,14 +686,14 @@ static int write_tiff_image(t4_rx_state_t *s)
TIFFSetField(t->tiff_file, TIFFTAG_VERSIONYEAR, "1998"); TIFFSetField(t->tiff_file, TIFFTAG_VERSIONYEAR, "1998");
TIFFSetField(t->tiff_file, TIFFTAG_MODENUMBER, 3); TIFFSetField(t->tiff_file, TIFFTAG_MODENUMBER, 3);
offset = 0; diroff = 0;
if (!TIFFWriteCustomDirectory(t->tiff_file, &offset)) if (!TIFFWriteCustomDirectory(t->tiff_file, &diroff))
span_log(&s->logging, SPAN_LOG_WARNING, "Failed to write custom directory.\n"); span_log(&s->logging, SPAN_LOG_WARNING, "Failed to write custom directory.\n");
/* Now go back and patch in the pointer to the new IFD */ /* Now go back and patch in the pointer to the new IFD */
if (!TIFFSetDirectory(t->tiff_file, s->current_page)) if (!TIFFSetDirectory(t->tiff_file, s->current_page))
span_log(&s->logging, SPAN_LOG_WARNING, "Failed to set directory.\n"); span_log(&s->logging, SPAN_LOG_WARNING, "Failed to set directory.\n");
if (!TIFFSetField(t->tiff_file, TIFFTAG_GLOBALPARAMETERSIFD, offset)) if (!TIFFSetField(t->tiff_file, TIFFTAG_GLOBALPARAMETERSIFD, diroff))
span_log(&s->logging, SPAN_LOG_WARNING, "Failed to set field.\n"); span_log(&s->logging, SPAN_LOG_WARNING, "Failed to set field.\n");
if (!TIFFWriteDirectory(t->tiff_file)) if (!TIFFWriteDirectory(t->tiff_file))
span_log(&s->logging, SPAN_LOG_WARNING, "%s: Failed to write directory for page %d.\n", t->file, s->current_page); span_log(&s->logging, SPAN_LOG_WARNING, "%s: Failed to write directory for page %d.\n", t->file, s->current_page);

2
libs/spandsp/src/t4_tx.c
View File

@ -409,7 +409,7 @@ static int get_tiff_directory_info(t4_tx_state_t *s)
char *u; char *u;
char uu[10]; char uu[10];
float *fl_parms; float *fl_parms;
uint64_t diroff; toff_t diroff;
float lmin; float lmin;
float lmax; float lmax;
float amin; float amin;

24
libs/spandsp/tests/t43_tests.c
View File

@ -185,7 +185,7 @@ int write_file(meta_t *meta, int page, const uint8_t buf[])
uint8_t *out_buf2; uint8_t *out_buf2;
packer_t packer; packer_t packer;
#if defined(SPANDSP_SUPPORT_TIFF_FX) #if defined(SPANDSP_SUPPORT_TIFF_FX)
uint64_t offset; toff_t diroff;
#endif #endif
tif = meta->tif; tif = meta->tif;
@ -319,13 +319,13 @@ int write_file(meta_t *meta, int page, const uint8_t buf[])
TIFFSetField(tif, TIFFTAG_VERSIONYEAR, "1998"); TIFFSetField(tif, TIFFTAG_VERSIONYEAR, "1998");
TIFFSetField(tif, TIFFTAG_MODENUMBER, 3); TIFFSetField(tif, TIFFTAG_MODENUMBER, 3);
offset = 0; diroff = 0;
if (!TIFFWriteCustomDirectory(tif, &offset)) if (!TIFFWriteCustomDirectory(tif, &diroff))
printf("Failed to write custom directory.\n"); printf("Failed to write custom directory.\n");
if (!TIFFSetDirectory(tif, (tdir_t) page)) if (!TIFFSetDirectory(tif, (tdir_t) page))
printf("Failed to set directory.\n"); printf("Failed to set directory.\n");
if (!TIFFSetField(tif, TIFFTAG_GLOBALPARAMETERSIFD, offset)) if (!TIFFSetField(tif, TIFFTAG_GLOBALPARAMETERSIFD, diroff))
printf("Failed to set global parameters IFD.\n"); printf("Failed to set global parameters IFD.\n");
if (!TIFFWriteDirectory(tif)) if (!TIFFWriteDirectory(tif))
printf("Failed to write directory.\n"); printf("Failed to write directory.\n");
@ -354,7 +354,7 @@ int read_file(meta_t *meta, int page)
float *fl_parms; float *fl_parms;
char uu[10]; char uu[10];
char *u; char *u;
uint64_t offset; toff_t diroff;
#endif #endif
TIFF *tif; TIFF *tif;
uint16_t *map_L; uint16_t *map_L;
@ -434,10 +434,10 @@ int read_file(meta_t *meta, int page)
#if defined(SPANDSP_SUPPORT_TIFF_FX) #if defined(SPANDSP_SUPPORT_TIFF_FX)
printf("Trying to get global parameters\n"); printf("Trying to get global parameters\n");
if (TIFFGetField(tif, TIFFTAG_GLOBALPARAMETERSIFD, &offset)) if (TIFFGetField(tif, TIFFTAG_GLOBALPARAMETERSIFD, &diroff))
{ {
printf("Got global parameters - %" PRIu64 "\n", offset); printf("Got global parameters - %" PRIu64 "\n", (uint64_t) diroff);
if (!TIFFReadCustomDirectory(tif, offset, &tiff_fx_field_array)) if (!TIFFReadCustomDirectory(tif, diroff, &tiff_fx_field_array))
{ {
printf("Failed to set global parameters IFD.\n"); printf("Failed to set global parameters IFD.\n");
} }
@ -893,7 +893,7 @@ int main(int argc, char *argv[])
int output_compression; int output_compression;
int page_no; int page_no;
#if defined(SPANDSP_SUPPORT_TIFF_FX) #if defined(SPANDSP_SUPPORT_TIFF_FX)
uint64_t offset; toff_t diroff;
#endif #endif
source_file = (argc > 1) ? argv[1] : IN_FILE_NAME; source_file = (argc > 1) ? argv[1] : IN_FILE_NAME;
@ -1385,13 +1385,13 @@ int main(int argc, char *argv[])
TIFFSetField(tif, TIFFTAG_VERSIONYEAR, "1998"); TIFFSetField(tif, TIFFTAG_VERSIONYEAR, "1998");
TIFFSetField(tif, TIFFTAG_MODENUMBER, 3); TIFFSetField(tif, TIFFTAG_MODENUMBER, 3);
offset = 0; diroff = 0;
if (!TIFFWriteCustomDirectory(tif, &offset)) if (!TIFFWriteCustomDirectory(tif, &diroff))
printf("Failed to write custom directory.\n"); printf("Failed to write custom directory.\n");
if (!TIFFSetDirectory(tif, (tdir_t) page_no)) if (!TIFFSetDirectory(tif, (tdir_t) page_no))
printf("Failed to set directory.\n"); printf("Failed to set directory.\n");
if (!TIFFSetField(tif, TIFFTAG_GLOBALPARAMETERSIFD, offset)) if (!TIFFSetField(tif, TIFFTAG_GLOBALPARAMETERSIFD, diroff))
printf("Failed to set global parameters IFD.\n"); printf("Failed to set global parameters IFD.\n");
if (!TIFFWriteDirectory(tif)) if (!TIFFWriteDirectory(tif))
printf("Failed to write directory.\n"); printf("Failed to write directory.\n");