[brlcad-commits] SF.net SVN: brlcad:[47393] brlcad/trunk/src/util
Open Source Solid Modeling CAD
Brought to you by:
brlcad
From: <br...@us...> - 2011-11-02 15:47:44
|
Revision: 47393 http://brlcad.svn.sourceforge.net/brlcad/?rev=47393&view=rev Author: brlcad Date: 2011-11-02 15:47:37 +0000 (Wed, 02 Nov 2011) Log Message: ----------- zlib.h needs to be included before png.h in case compression flags are used. also, they're system headers, so use brackets instead of quotes and pull them up into the right section. Modified Paths: -------------- brlcad/trunk/src/util/bw-png.c brlcad/trunk/src/util/pix-png.c brlcad/trunk/src/util/png-bw.c brlcad/trunk/src/util/png-pix.c brlcad/trunk/src/util/png_info.c Modified: brlcad/trunk/src/util/bw-png.c =================================================================== --- brlcad/trunk/src/util/bw-png.c 2011-11-02 14:57:56 UTC (rev 47392) +++ brlcad/trunk/src/util/bw-png.c 2011-11-02 15:47:37 UTC (rev 47393) @@ -27,10 +27,10 @@ #include <stdlib.h> #include <math.h> -#include "zlib.h" +#include <zlib.h> +#include <png.h> #include "bio.h" -#include "png.h" #include "bu.h" #include "vmath.h" #include "bn.h" Modified: brlcad/trunk/src/util/pix-png.c =================================================================== --- brlcad/trunk/src/util/pix-png.c 2011-11-02 14:57:56 UTC (rev 47392) +++ brlcad/trunk/src/util/pix-png.c 2011-11-02 15:47:37 UTC (rev 47393) @@ -33,11 +33,10 @@ #ifdef HAVE_SYS_STAT_H # include <sys/stat.h> #endif +#include <zlib.h> +#include <png.h> #include "bio.h" -#include "zlib.h" -#include "png.h" - #include "bu.h" #include "vmath.h" #include "bn.h" Modified: brlcad/trunk/src/util/png-bw.c =================================================================== --- brlcad/trunk/src/util/png-bw.c 2011-11-02 14:57:56 UTC (rev 47392) +++ brlcad/trunk/src/util/png-bw.c 2011-11-02 15:47:37 UTC (rev 47393) @@ -28,13 +28,13 @@ #include <stdlib.h> #include <math.h> #include <string.h> +#include <zlib.h> +#include <png.h> #include "bio.h" -#include "png.h" #include "bu.h" #include "vmath.h" #include "bn.h" -#include "zlib.h" static png_color_16 def_backgrd={ 0, 0, 0, 0, 0 }; static int verbose=0; Modified: brlcad/trunk/src/util/png-pix.c =================================================================== --- brlcad/trunk/src/util/png-pix.c 2011-11-02 14:57:56 UTC (rev 47392) +++ brlcad/trunk/src/util/png-pix.c 2011-11-02 15:47:37 UTC (rev 47393) @@ -27,13 +27,13 @@ #include <stdlib.h> #include <math.h> +#include <zlib.h> +#include <png.h> #include "bio.h" -#include "png.h" #include "bu.h" #include "vmath.h" #include "bn.h" -#include "zlib.h" static png_color_16 def_backgrd={ 0, 0, 0, 0, 0 }; Modified: brlcad/trunk/src/util/png_info.c =================================================================== --- brlcad/trunk/src/util/png_info.c 2011-11-02 14:57:56 UTC (rev 47392) +++ brlcad/trunk/src/util/png_info.c 2011-11-02 15:47:37 UTC (rev 47393) @@ -25,20 +25,22 @@ #include "common.h" -#include <stdio.h> #include <stdlib.h> #include <math.h> -#include "png.h" +#include <zlib.h> +#include <png.h> +#include "bio.h" + #include "bu.h" #include "vmath.h" #include "bn.h" -#include "zlib.h" -static char *usage="Usage:\n\t%s png__file\n"; int main(int argc, char **argv) { + static char *usage="Usage:\n\t%s png__file\n"; + int i; FILE *fp_in = NULL; png_structp png_p; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |