kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-07-21 19:45:34 +00:00
Code Issues Projects Releases Wiki Activity

oops merge error

Browse Source
This commit is contained in:
Ken Rice 2012-09-11 14:59:17 -04:00
parent 508aabe2cf
commit 3fd1a57902
1 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1030,11 +1030,7 @@ SPAN_DECLARE(int) t42_itulab_to_itulab(logging_state_t *logging, tdata_t *dst, t
for (pos = 0; pos < srclen; pos += compressor.image_width*compressor.num_components) for (pos = 0; pos < srclen; pos += compressor.image_width*compressor.num_components)
{ {
<<<<<<< HEAD
scan_line_in = (JSAMPROW) src + pos; scan_line_in = (JSAMPROW) src + pos;
=======
scan_line_in = (JSAMPROW)src + pos;
>>>>>>> FS-4504 vs2010 only - plus mod_sofia fix - anybody want to help with 2008
jpeg_write_scanlines(&compressor, &scan_line_in, 1); jpeg_write_scanlines(&compressor, &scan_line_in, 1);
} }
@ -1151,11 +1147,7 @@ SPAN_DECLARE(int) t42_itulab_to_srgb(logging_state_t *logging, lab_params_t *s,
for (pos = 0; decompressor.output_scanline < decompressor.output_height; pos += decompressor.output_width*decompressor.num_components) for (pos = 0; decompressor.output_scanline < decompressor.output_height; pos += decompressor.output_width*decompressor.num_components)
{ {
<<<<<<< HEAD
scan_line_out = (JSAMPROW) dst + pos; scan_line_out = (JSAMPROW) dst + pos;
=======
scan_line_out = (JSAMPROW)dst + pos;
>>>>>>> FS-4504 vs2010 only - plus mod_sofia fix - anybody want to help with 2008
jpeg_read_scanlines(&decompressor, &scan_line_in, 1); jpeg_read_scanlines(&decompressor, &scan_line_in, 1);
lab_to_srgb(s, scan_line_out, scan_line_in, decompressor.output_width); lab_to_srgb(s, scan_line_out, scan_line_in, decompressor.output_width);
} }