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

libs/spandsp/src/t42.c

@@ -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)
     {
+<<<<<<< HEAD
         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);
     }
 
@@ -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)
     {
+<<<<<<< HEAD
         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);
         lab_to_srgb(s, scan_line_out, scan_line_in, decompressor.output_width);
     }

libs/win32/libjpeg/libjpeg.2010.vcxproj

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