kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-03-14 04:54:49 +00:00
Code Issues Projects Releases Wiki Activity

FS-4504 vs2010 only - plus mod_sofia fix - anybody want to help with 2008

Browse Source
This commit is contained in:
Jeff Lenk 2012-08-08 21:18:06 -05:00 committed by Ken Rice
parent c920135658
commit ffebc6ac9c
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1032,7 +1032,11 @@ 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);
} }
@ -1149,7 +1153,11 @@ 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);
} }

2
libs/win32/libjpeg/libjpeg.2010.vcxproj
View File

@ -229,4 +229,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets"> <ImportGroup Label="ExtensionTargets">
</ImportGroup> </ImportGroup>
</Project> </Project>