Update of /cvsroot/wavelet/Wavelet
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv28437
Modified Files:
AviWriter.cc PgmWriter.cc tools.cc
Log Message:
Some syntax fixes for g++ 4.2 compatibility
Index: AviWriter.cc
===================================================================
RCS file: /cvsroot/wavelet/Wavelet/AviWriter.cc,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** AviWriter.cc 7 Aug 2007 17:00:58 -0000 1.8
--- AviWriter.cc 19 Sep 2007 09:35:07 -0000 1.9
***************
*** 52,56 ****
int xysize = m_arrays[0]->size ();
int frames = m_arrays[0]->frames ();
! AVI_set_video(avi, xsize, ysize, m_frameRate, "");
oneFrame = NEW (pixel [m_channels * xysize]);
/* import */
--- 52,56 ----
int xysize = m_arrays[0]->size ();
int frames = m_arrays[0]->frames ();
! AVI_set_video(avi, xsize, ysize, m_frameRate, (char*)"");
oneFrame = NEW (pixel [m_channels * xysize]);
/* import */
Index: PgmWriter.cc
===================================================================
RCS file: /cvsroot/wavelet/Wavelet/PgmWriter.cc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** PgmWriter.cc 7 Aug 2007 17:00:58 -0000 1.3
--- PgmWriter.cc 19 Sep 2007 09:35:07 -0000 1.4
***************
*** 20,24 ****
{
fhandle = stdout;
! writename = "none (stdout)";
}
else
--- 20,24 ----
{
fhandle = stdout;
! writename = (char*)"none (stdout)";
}
else
Index: tools.cc
===================================================================
RCS file: /cvsroot/wavelet/Wavelet/tools.cc,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** tools.cc 7 Aug 2007 17:00:59 -0000 1.7
--- tools.cc 19 Sep 2007 09:35:07 -0000 1.8
***************
*** 84,88 ****
tools_areaToString (const area a)
{
! static char *names[HH + 1] = {"LL", "HL", "LH", "HH"};
return names[a];
}
--- 84,88 ----
tools_areaToString (const area a)
{
! static const char *names[HH + 1] = {"LL", "HL", "LH", "HH"};
return names[a];
}
|
