[Freeswitch-svn] [commit] r12199 - in freeswitch/trunk/libs/spandsp/src: . msvc

[FreeSWITCH SVN]

Author: mikej
Date: Fri Feb 20 14:49:59 2009
New Revision: 12199

Log:
fix msvc release mode build errors

Modified:
   freeswitch/trunk/libs/spandsp/src/fax_modems.c
   freeswitch/trunk/libs/spandsp/src/msvc/   (props changed)
   freeswitch/trunk/libs/spandsp/src/t4.c

Modified: freeswitch/trunk/libs/spandsp/src/fax_modems.c
==============================================================================
--- freeswitch/trunk/libs/spandsp/src/fax_modems.c	(original)
+++ freeswitch/trunk/libs/spandsp/src/fax_modems.c	Fri Feb 20 14:49:59 2009
@@ -87,7 +87,7 @@
 
 #define HDLC_FRAMING_OK_THRESHOLD               5
 
-int fax_modems_v17_v21_rx(void *user_data, const int16_t amp[], int len)
+SPAN_DECLARE(int) fax_modems_v17_v21_rx(void *user_data, const int16_t amp[], int len)
 {
     fax_modems_state_t *s;
 
@@ -106,7 +106,7 @@
 }
 /*- End of function --------------------------------------------------------*/
 
-int fax_modems_v27ter_v21_rx(void *user_data, const int16_t amp[], int len)
+SPAN_DECLARE(int) fax_modems_v27ter_v21_rx(void *user_data, const int16_t amp[], int len)
 {
     fax_modems_state_t *s;
 
@@ -125,7 +125,7 @@
 }
 /*- End of function --------------------------------------------------------*/
 
-int fax_modems_v29_v21_rx(void *user_data, const int16_t amp[], int len)
+SPAN_DECLARE(int) fax_modems_v29_v21_rx(void *user_data, const int16_t amp[], int len)
 {
     fax_modems_state_t *s;
 

Modified: freeswitch/trunk/libs/spandsp/src/t4.c
==============================================================================
--- freeswitch/trunk/libs/spandsp/src/t4.c	(original)
+++ freeswitch/trunk/libs/spandsp/src/t4.c	Fri Feb 20 14:49:59 2009
@@ -410,7 +410,7 @@
         return -1;
     parm = 0;
     TIFFGetField(t->tiff_file, TIFFTAG_IMAGEWIDTH, &parm);
-    if (s->image_width != parm)
+    if (s->image_width != (int)parm)
     {
 printf("Width changed\n");
         return 1;
@@ -1959,7 +1959,7 @@
     s->stop_page = (stop_page >= 0)  ?  stop_page : INT_MAX;
 
     if (!TIFFSetDirectory(s->tiff.tiff_file, (tdir_t) s->current_page))
-        return -1;
+        return NULL;
     if (get_tiff_directory_info(s))
     {
         close_tiff_input_file(s);