From: Stefan v. d. W. <sj...@us...> - 2005-11-22 11:42:09
|
Update of /cvsroot/octave/octave-forge/main/image In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11404 Modified Files: pngread.cc pngwrite.cc Log Message: PNG headers want to include setjmp.h first. Order changed and C++ #ifdefs removed [with Orion Poplawski]. Index: pngwrite.cc =================================================================== RCS file: /cvsroot/octave/octave-forge/main/image/pngwrite.cc,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- pngwrite.cc 12 Oct 2005 15:05:29 -0000 1.2 +++ pngwrite.cc 22 Nov 2005 11:42:02 -0000 1.3 @@ -37,19 +37,9 @@ * - Fix bugs, restructure */ -#include <octave/oct.h> - -#ifdef __cplusplus -extern "C" { -#endif - #include "png.h" - -#ifdef __cplusplus -} //extern "C" -#endif - #include "pngcanvas.h" +#include <octave/oct.h> void save_canvas(canvas *can, char *filename); Index: pngread.cc =================================================================== RCS file: /cvsroot/octave/octave-forge/main/image/pngread.cc,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- pngread.cc 13 Oct 2005 12:43:14 -0000 1.5 +++ pngread.cc 22 Nov 2005 11:42:02 -0000 1.6 @@ -37,19 +37,9 @@ * - Fix bugs, restructure */ -#include <octave/oct.h> - -#ifdef __cplusplus -extern "C" { -#endif - #include "png.h" - -#ifdef __cplusplus -} //extern "C" -#endif - #include "pngcanvas.h" +#include <octave/oct.h> canvas *load_canvas(char *filename); |