From c8e4259aebdecf935ea6bac95e0d91bb17df6c8c Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Wed, 2 Apr 2003 05:53:23 +0000
Subject: [PATCH] Added PNG support
---
Fltk/Callbacks.cpp | 26 ++++++-
Fltk/Opengl.cpp | 7 +-
Graphics/CreateFile.cpp | 88 +++++++++++------------
Graphics/Makefile | 5 +-
Graphics/gl2jpeg.cpp | 4 +-
Graphics/gl2png.cpp | 115 ++++++++++++++++++++++++++++++
Graphics/gl2png.h | 30 ++++++++
Mesh/Mesh.h | 2 +
TODO | 6 +-
configure | 154 +++++++++++++++++++++++++++++++++++++++-
configure.in | 38 +++++++++-
11 files changed, 410 insertions(+), 65 deletions(-)
create mode 100644 Graphics/gl2png.cpp
create mode 100644 Graphics/gl2png.h
diff --git a/Fltk/Callbacks.cpp b/Fltk/Callbacks.cpp
index b386c8e203..7a30bc7e1d 100644
--- a/Fltk/Callbacks.cpp
+++ b/Fltk/Callbacks.cpp
@@ -1,4 +1,4 @@
-// $Id: Callbacks.cpp,v 1.172 2003-04-01 17:14:59 geuzaine Exp $
+// $Id: Callbacks.cpp,v 1.173 2003-04-02 05:53:23 geuzaine Exp $
//
// Copyright (C) 1997-2003 C. Geuzaine, J.-F. Remacle
//
@@ -473,6 +473,10 @@ void _save_jpegtex(char *name)
{
CreateOutputFile(name, FORMAT_JPEGTEX);
}
+void _save_pngtex(char *name)
+{
+ CreateOutputFile(name, FORMAT_PNGTEX);
+}
void _save_tex(char *name)
{
CreateOutputFile(name, FORMAT_TEX);
@@ -481,6 +485,10 @@ void _save_jpeg(char *name)
{
CreateOutputFile(name, FORMAT_JPEG);
}
+void _save_png(char *name)
+{
+ CreateOutputFile(name, FORMAT_PNG);
+}
void _save_gif(char *name)
{
int dither = CTX.print.gif_dither;
@@ -546,12 +554,14 @@ void file_save_as_cb(CALLBACK_ARGS)
{"GIF dithered (*.gif)", _save_gif_dithered},
{"GIF transparent (*.gif)", _save_gif_transparent},
{"JPEG (*.jpg)", _save_jpeg},
+ {"PNG (*.png)", _save_png},
{"PostScript fast (*.ps)", _save_ps_simple},
{"PostScript accurate (*.ps)", _save_ps_accurate},
{"Encapsulated PostScript fast (*.eps)", _save_eps_simple},
{"Encapsulated PostScript accurate (*.eps)", _save_eps_accurate},
{"PPM (*.ppm)", _save_ppm},
{"LaTeX JPEG part (*.jpg)", _save_jpegtex},
+ {"LaTeX PNG part (*.png)", _save_pngtex},
{"LaTeX EPS part fast (*.eps)", _save_epstex_simple},
{"LaTeX EPS part accurate (*.eps)", _save_epstex_accurate},
{"LaTeX TeX part (*.tex)", _save_tex},
@@ -670,10 +680,16 @@ void file_save_as_pstex_accurate_cb(CALLBACK_ARGS)
void file_save_as_jpegtex_cb(CALLBACK_ARGS)
{
- if(file_chooser(0, "Save LaTeX file (Jpeg part)", "*", 0))
+ if(file_chooser(0, "Save LaTeX file (JPEG part)", "*", 0))
_save_jpegtex(file_chooser_get_name(1));
}
+void file_save_as_pngtex_cb(CALLBACK_ARGS)
+{
+ if(file_chooser(0, "Save LaTeX file (PNG part)", "*", 0))
+ _save_pngtex(file_chooser_get_name(1));
+}
+
void file_save_as_tex_cb(CALLBACK_ARGS)
{
if(file_chooser(0, "Save LaTeX file (TeX part)", "*", 0))
@@ -686,6 +702,12 @@ void file_save_as_jpeg_cb(CALLBACK_ARGS)
_save_jpeg(file_chooser_get_name(1));
}
+void file_save_as_png_cb(CALLBACK_ARGS)
+{
+ if(file_chooser(0, "Save PNG file", "*", 0))
+ _save_png(file_chooser_get_name(1));
+}
+
void file_save_as_gif_cb(CALLBACK_ARGS)
{
if(file_chooser(0, "Save GIF file", "*", 0))
diff --git a/Fltk/Opengl.cpp b/Fltk/Opengl.cpp
index a3553f72d2..b8154c669f 100644
--- a/Fltk/Opengl.cpp
+++ b/Fltk/Opengl.cpp
@@ -1,4 +1,4 @@
-// $Id: Opengl.cpp,v 1.32 2003-03-21 00:52:37 geuzaine Exp $
+// $Id: Opengl.cpp,v 1.33 2003-04-02 05:53:23 geuzaine Exp $
//
// Copyright (C) 1997-2003 C. Geuzaine, J.-F. Remacle
//
@@ -79,8 +79,9 @@ void Draw_String(char *s)
gl_font(FL_HELVETICA, CTX.gl_fontsize);
gl_draw(s);
}
- else { // ps, pstex or jpegtex output
- if(CTX.print.format == FORMAT_JPEGTEX)
+ else { // ps or *tex output
+ if(CTX.print.format == FORMAT_JPEGTEX ||
+ CTX.print.format == FORMAT_PNGTEX)
return;
gl2psText(s, CTX.print.eps_font, CTX.print.eps_font_size);
}
diff --git a/Graphics/CreateFile.cpp b/Graphics/CreateFile.cpp
index ed299eaff8..1228b6a89e 100644
--- a/Graphics/CreateFile.cpp
+++ b/Graphics/CreateFile.cpp
@@ -1,4 +1,4 @@
-// $Id: CreateFile.cpp,v 1.41 2003-03-21 00:52:38 geuzaine Exp $
+// $Id: CreateFile.cpp,v 1.42 2003-04-02 05:53:23 geuzaine Exp $
//
// Copyright (C) 1997-2003 C. Geuzaine, J.-F. Remacle
//
@@ -33,6 +33,7 @@ extern Mesh M;
#include "gl2ps.h"
#include "gl2gif.h"
#include "gl2jpeg.h"
+#include "gl2png.h"
#include "gl2ppm.h"
#include "gl2yuv.h"
@@ -83,6 +84,8 @@ void CreateOutputFile(char *name, int format)
CreateOutputFile(name, FORMAT_JPEG);
else if(!strcmp(ext, ".jpeg"))
CreateOutputFile(name, FORMAT_JPEG);
+ else if(!strcmp(ext, ".png"))
+ CreateOutputFile(name, FORMAT_PNG);
else if(!strcmp(ext, ".ps"))
CreateOutputFile(name, FORMAT_PS);
else if(!strcmp(ext, ".eps"))
@@ -119,79 +122,68 @@ void CreateOutputFile(char *name, int format)
break;
case FORMAT_MSH:
- Print_Mesh(&M, name, FORMAT_MSH);
- break;
-
case FORMAT_UNV:
- Print_Mesh(&M, name, FORMAT_UNV);
- break;
-
case FORMAT_GREF:
- Print_Mesh(&M, name, FORMAT_GREF);
- break;
-
case FORMAT_VRML:
- Print_Mesh(&M, name, FORMAT_VRML);
+ Print_Mesh(&M, name, format);
break;
case FORMAT_JPEG:
case FORMAT_JPEGTEX:
+ case FORMAT_PNG:
+ case FORMAT_PNGTEX:
if(!(fp = fopen(name, "wb"))) {
Msg(GERROR, "Unable to open file '%s'", name);
return;
}
- if(format == FORMAT_JPEGTEX)
+ if(format == FORMAT_JPEGTEX || format == FORMAT_PNGTEX){
CTX.print.gl_fonts = 0;
+ }
FillBuffer();
CTX.print.gl_fonts = 1;
- create_jpeg(fp, CTX.viewport[2] - CTX.viewport[0],
- CTX.viewport[3] - CTX.viewport[1], CTX.print.jpeg_quality);
- Msg(INFO, "JPEG creation complete '%s'", name);
- Msg(STATUS2, "Wrote '%s'", name);
- fclose(fp);
- break;
-
- case FORMAT_GIF:
- if(!(fp = fopen(name, "wb"))) {
- Msg(GERROR, "Unable to open file '%s'", name);
- return;
+ if(format == FORMAT_JPEG || format == FORMAT_JPEGTEX){
+ create_jpeg(fp, CTX.viewport[2] - CTX.viewport[0],
+ CTX.viewport[3] - CTX.viewport[1], CTX.print.jpeg_quality);
+ Msg(INFO, "JPEG creation complete '%s'", name);
}
- FillBuffer();
- create_gif(fp, CTX.viewport[2] - CTX.viewport[0],
- CTX.viewport[3] - CTX.viewport[1],
- CTX.print.gif_dither,
- CTX.print.gif_sort,
- CTX.print.gif_interlace,
- CTX.print.gif_transparent,
- UNPACK_RED(CTX.color.bg),
- UNPACK_GREEN(CTX.color.bg), UNPACK_BLUE(CTX.color.bg));
- Msg(INFO, "GIF creation complete '%s'", name);
- Msg(STATUS2, "Wrote '%s'", name);
- fclose(fp);
- break;
-
- case FORMAT_PPM:
- if(!(fp = fopen(name, "wb"))) {
- Msg(GERROR, "Unable to open file '%s'", name);
- return;
+ else{
+ create_png(fp, CTX.viewport[2] - CTX.viewport[0],
+ CTX.viewport[3] - CTX.viewport[1], 100);
+ Msg(INFO, "PNG creation complete '%s'", name);
}
- FillBuffer();
- create_ppm(fp, CTX.viewport[2] - CTX.viewport[0],
- CTX.viewport[3] - CTX.viewport[1]);
- Msg(INFO, "PPM creation complete '%s'", name);
Msg(STATUS2, "Wrote '%s'", name);
fclose(fp);
break;
+ case FORMAT_PPM:
case FORMAT_YUV:
+ case FORMAT_GIF:
if(!(fp = fopen(name, "wb"))) {
Msg(GERROR, "Unable to open file '%s'", name);
return;
}
FillBuffer();
- create_yuv(fp, CTX.viewport[2] - CTX.viewport[0],
- CTX.viewport[3] - CTX.viewport[1]);
- Msg(INFO, "YUV creation complete '%s'", name);
+ if(format == FORMAT_PPM){
+ create_ppm(fp, CTX.viewport[2] - CTX.viewport[0],
+ CTX.viewport[3] - CTX.viewport[1]);
+ Msg(INFO, "PPM creation complete '%s'", name);
+ }
+ else if (format == FORMAT_YUV){
+ create_yuv(fp, CTX.viewport[2] - CTX.viewport[0],
+ CTX.viewport[3] - CTX.viewport[1]);
+ Msg(INFO, "YUV creation complete '%s'", name);
+ }
+ else{
+ create_gif(fp, CTX.viewport[2] - CTX.viewport[0],
+ CTX.viewport[3] - CTX.viewport[1],
+ CTX.print.gif_dither,
+ CTX.print.gif_sort,
+ CTX.print.gif_interlace,
+ CTX.print.gif_transparent,
+ UNPACK_RED(CTX.color.bg),
+ UNPACK_GREEN(CTX.color.bg), UNPACK_BLUE(CTX.color.bg));
+ Msg(INFO, "GIF creation complete '%s'", name);
+ }
Msg(STATUS2, "Wrote '%s'", name);
fclose(fp);
break;
diff --git a/Graphics/Makefile b/Graphics/Makefile
index 206d9c16f4..763f3e643a 100644
--- a/Graphics/Makefile
+++ b/Graphics/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.50 2003-03-26 21:43:10 geuzaine Exp $
+# $Id: Makefile,v 1.51 2003-04-02 05:53:23 geuzaine Exp $
#
# Copyright (C) 1997-2003 C. Geuzaine, J.-F. Remacle
#
@@ -42,6 +42,7 @@ SRC = Draw.cpp \
gl2ps.cpp\
gl2gif.cpp\
gl2jpeg.cpp\
+ gl2png.cpp\
gl2ppm.cpp\
gl2yuv.cpp
@@ -154,7 +155,7 @@ CreateFile.o: CreateFile.cpp ../Common/Gmsh.h ../Common/Message.h \
../Geo/ExtrudeParams.h ../Mesh/STL.h ../Mesh/Metric.h ../Mesh/Matrix.h \
../Parser/OpenFile.h Draw.h ../Common/Views.h ../Common/ColorTable.h \
../Common/Context.h ../Common/Options.h gl2ps.h gl2gif.h gl2jpeg.h \
- gl2ppm.h gl2yuv.h
+ gl2ppm.h gl2yuv.h gl2png.h
gl2ps.o: gl2ps.cpp gl2ps.h
gl2gif.o: gl2gif.cpp ../Common/Gmsh.h ../Common/Message.h \
../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
diff --git a/Graphics/gl2jpeg.cpp b/Graphics/gl2jpeg.cpp
index b12fd634bc..482d015bd9 100644
--- a/Graphics/gl2jpeg.cpp
+++ b/Graphics/gl2jpeg.cpp
@@ -2,7 +2,7 @@
* GL2JPEG, an OpenGL to JPEG Printing Library
* Copyright (C) 1999-2002 Christophe Geuzaine
*
- * $Id: gl2jpeg.cpp,v 1.16 2003-03-01 22:36:40 geuzaine Exp $
+ * $Id: gl2jpeg.cpp,v 1.17 2003-04-02 05:53:23 geuzaine Exp $
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
@@ -27,7 +27,7 @@
void create_jpeg(FILE * outfile, int width, int height, int quality)
{
- Msg(GERROR, "This version of Gmsh was compiled without jpeg support");
+ Msg(GERROR, "This version of Gmsh was compiled without JPEG support");
}
#else
diff --git a/Graphics/gl2png.cpp b/Graphics/gl2png.cpp
new file mode 100644
index 0000000000..c0454d4196
--- /dev/null
+++ b/Graphics/gl2png.cpp
@@ -0,0 +1,115 @@
+/*
+ * GL2PNG, an OpenGL to PNG Printing Library
+ * Copyright (C) 2003 Christophe Geuzaine
+ *
+ * $Id: gl2png.cpp,v 1.1 2003-04-02 05:53:23 geuzaine Exp $
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the Free
+ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ */
+
+#include "Gmsh.h"
+#include "GmshUI.h"
+
+#if !defined(HAVE_LIBPNG)
+
+void create_png(FILE * file, int width, int height, int quality)
+{
+ Msg(GERROR, "This version of Gmsh was compiled without PNG support");
+}
+
+#else
+
+#include <png.h>
+
+#ifndef png_jmpbuf
+# define png_jmpbuf(png_ptr) ((png_ptr)->jmpbuf)
+#endif
+
+/*
+ compression_level = Z_DEFAULT_COMPRESSION;
+ compression_level = Z_BEST_SPEED;
+ compression_level = Z_BEST_COMPRESSION;
+ compression_level = Z_NO_COMPRESSION;
+*/
+
+void create_png(FILE * file, int width, int height, int quality)
+{
+ int row;
+ int compression_level = Z_DEFAULT_COMPRESSION;
+ png_structp png_ptr;
+ png_infop info_ptr;
+ png_text text_ptr[10];
+ unsigned char *pixels;
+ png_byte image[height][width*3];
+ png_bytep row_pointers[height];
+ time_t now;
+
+ time(&now);
+
+ png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
+
+ if(png_ptr == NULL) {
+ Msg(GERROR, "Could not create PNG write struct");
+ return;
+ }
+
+ info_ptr = png_create_info_struct(png_ptr);
+
+ if(info_ptr == NULL) {
+ png_destroy_write_struct(&png_ptr, png_infopp_NULL);
+ Msg(GERROR, "Could not create PNG info struct");
+ return;
+ }
+
+ if(setjmp(png_jmpbuf(png_ptr))) {
+ png_destroy_write_struct(&png_ptr, &info_ptr);
+ Msg(GERROR, "Could not setjmp in PNG");
+ return;
+ }
+
+ png_init_io(png_ptr, file);
+
+ png_set_compression_level (png_ptr, compression_level);
+
+ png_set_IHDR(png_ptr, info_ptr, width, height, 8, PNG_COLOR_TYPE_RGB,
+ PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_BASE, PNG_FILTER_TYPE_BASE);
+
+ text_ptr[0].key = "Creator";
+ text_ptr[0].text = "Gmsh";
+ text_ptr[0].compression = PNG_TEXT_COMPRESSION_NONE;
+ text_ptr[1].key = "Date";
+ text_ptr[1].text = ctime(&now);
+ text_ptr[1].compression = PNG_TEXT_COMPRESSION_NONE;
+ png_set_text(png_ptr, info_ptr, text_ptr, 2);
+
+ png_write_info(png_ptr, info_ptr);
+
+ glPixelStorei(GL_PACK_ALIGNMENT, 1);
+ glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
+ pixels = (unsigned char *)Malloc(width * 3 * sizeof (unsigned char));
+ for (row = height - 1; row >= 0; row--) {
+ glReadPixels(0, row, width, 1, GL_RGB, GL_UNSIGNED_BYTE, pixels);
+ png_write_row(png_ptr, (png_bytep)pixels);
+ }
+ Free(pixels);
+
+ png_write_end(png_ptr, info_ptr);
+
+ png_destroy_write_struct(&png_ptr, &info_ptr);
+}
+
+#endif
+
diff --git a/Graphics/gl2png.h b/Graphics/gl2png.h
new file mode 100644
index 0000000000..51e44a54bd
--- /dev/null
+++ b/Graphics/gl2png.h
@@ -0,0 +1,30 @@
+#ifndef _GL2PNG_H_
+#define _GL2PNG_H_
+
+/*
+ * GL2JPEG, an OpenGL to JPEG Printing Library
+ * Copyright (C) 2003 Christophe Geuzaine
+ *
+ * $Id: gl2png.h,v 1.1 2003-04-02 05:53:23 geuzaine Exp $
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the Free
+ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ */
+
+#include <stdio.h>
+
+void create_png(FILE *outfile, int width, int height, int quality);
+
+#endif
diff --git a/Mesh/Mesh.h b/Mesh/Mesh.h
index eb5a5af9dc..46cf84669a 100644
--- a/Mesh/Mesh.h
+++ b/Mesh/Mesh.h
@@ -48,6 +48,8 @@
#define FORMAT_VRML 19
#define FORMAT_EPS 20
#define FORMAT_EPSTEX 21
+#define FORMAT_PNG 22
+#define FORMAT_PNGTEX 23
#define CONV_VALUE 0.8
diff --git a/TODO b/TODO
index f77b1e6abb..e5e5a3265b 100644
--- a/TODO
+++ b/TODO
@@ -1,8 +1,4 @@
-$Id: TODO,v 1.17 2003-04-01 17:06:02 geuzaine Exp $
-
-********************************************************************
-
-gl2png would be nice...
+$Id: TODO,v 1.18 2003-04-02 05:53:23 geuzaine Exp $
********************************************************************
diff --git a/configure b/configure
index ed631c2b80..ea27a0aef3 100755
--- a/configure
+++ b/configure
@@ -842,7 +842,12 @@ Optional Packages:
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
--with-fltk-prefix=PFX prefix where FLTK is installed
--with-gsl-prefix=PFX prefix where GSL is installed
- --with-jpeg-prefix=PFX prefix where the JPEG code is installed
+ --with-jpeg-prefix=PFX prefix where the JPEG library and includes are
+ installed
+ --with-png-prefix=PFX prefix where the PNG library and includes are
+ installed
+ --with-z-prefix=PFX prefix where the ZLIB library and includes are
+ installed
Some influential environment variables:
CC C compiler command
@@ -1229,6 +1234,22 @@ else
JPEG_PREFIX="$JPEG_DIR"
fi;
+# Check whether --with-png-prefix or --without-png-prefix was given.
+if test "${with_png_prefix+set}" = set; then
+ withval="$with_png_prefix"
+ PNG_PREFIX=$withval
+else
+ PNG_PREFIX="$PNG_DIR"
+fi;
+
+# Check whether --with-z-prefix or --without-z-prefix was given.
+if test "${with_z_prefix+set}" = set; then
+ withval="$with_z_prefix"
+ Z_PREFIX=$withval
+else
+ Z_PREFIX="$Z_DIR"
+fi;
+
# Check whether --enable-gsl or --disable-gsl was given.
if test "${enable_gsl+set}" = set; then
enableval="$enable_gsl"
@@ -2911,6 +2932,137 @@ fi
fi
fi
+ if test "x${Z_PREFIX}" != "x"; then
+ LDFLAGS="-L${Z_PREFIX} -L${Z_PREFIX}/lib ${LDFLAGS}"
+ fi
+ echo "$as_me:$LINENO: checking for main in -lz" >&5
+echo $ECHO_N "checking for main in -lz... $ECHO_C" >&6
+if test "${ac_cv_lib_z_main+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lz $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+#include "confdefs.h"
+
+
+#ifdef F77_DUMMY_MAIN
+# ifdef __cplusplus
+ extern "C"
+# endif
+ int F77_DUMMY_MAIN() { return 1; }
+#endif
+int
+main ()
+{
+main ();
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_lib_z_main=yes
+else
+ echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+ac_cv_lib_z_main=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_z_main" >&5
+echo "${ECHO_T}$ac_cv_lib_z_main" >&6
+if test $ac_cv_lib_z_main = yes; then
+ Z="yes"
+else
+ Z="no"
+fi
+
+ if test "x${Z}" = "xyes"; then
+ if test "x${PNG_PREFIX}" != "x"; then
+ LDFLAGS="-L${PNG_PREFIX} -L${PNG_PREFIX}/lib ${LDFLAGS}"
+ fi
+ echo "$as_me:$LINENO: checking for main in -lpng" >&5
+echo $ECHO_N "checking for main in -lpng... $ECHO_C" >&6
+if test "${ac_cv_lib_png_main+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lpng $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+#include "confdefs.h"
+
+
+#ifdef F77_DUMMY_MAIN
+# ifdef __cplusplus
+ extern "C"
+# endif
+ int F77_DUMMY_MAIN() { return 1; }
+#endif
+int
+main ()
+{
+main ();
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_lib_png_main=yes
+else
+ echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+ac_cv_lib_png_main=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_png_main" >&5
+echo "${ECHO_T}$ac_cv_lib_png_main" >&6
+if test $ac_cv_lib_png_main = yes; then
+ PNG="yes"
+else
+ PNG="no"
+fi
+
+ if test "x${PNG}" = "xyes"; then
+ FLAGS="-DHAVE_LIBPNG ${FLAGS}"
+ if test "x${PNG_PREFIX}" != "x"; then
+ GMSH_LIBS="${GMSH_LIBS} -L${PNG_PREFIX} -L${PNG_PREFIX}/lib"
+ INCLS="${INCLS} -I${PNG_PREFIX} -I${PNG_PREFIX}/include"
+ fi
+ if test "x${Z_PREFIX}" != "x"; then
+ GMSH_LIBS="${GMSH_LIBS} -L${Z_PREFIX} -L${Z_PREFIX}/lib -lz"
+ INCLS="${INCLS} -I${Z_PREFIX} -I${Z_PREFIX}/include"
+ fi
+ GMSH_LIBS="${GMSH_LIBS} -lpng -lz"
+ fi
+ fi
+
else
GMSH_DIRS="${GMSH_DIRS} Box"
diff --git a/configure.in b/configure.in
index ef1e213fb5..7cda1c3c4e 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-dnl $Id: configure.in,v 1.33 2003-03-23 04:59:45 geuzaine Exp $
+dnl $Id: configure.in,v 1.34 2003-04-02 05:53:23 geuzaine Exp $
dnl
dnl Copyright (C) 1997-2003 C. Geuzaine, J.-F. Remacle
dnl
@@ -39,8 +39,16 @@ AC_ARG_WITH(gsl-prefix,
[GSL_PREFIX=$withval],[GSL_PREFIX="$GSL_DIR"])
AC_ARG_WITH(jpeg-prefix,
AC_HELP_STRING([--with-jpeg-prefix=PFX],
- [prefix where the JPEG code is installed]),
+ [prefix where the JPEG library and includes are installed]),
[JPEG_PREFIX=$withval],[JPEG_PREFIX="$JPEG_DIR"])
+AC_ARG_WITH(png-prefix,
+ AC_HELP_STRING([--with-png-prefix=PFX],
+ [prefix where the PNG library and includes are installed]),
+ [PNG_PREFIX=$withval],[PNG_PREFIX="$PNG_DIR"])
+AC_ARG_WITH(z-prefix,
+ AC_HELP_STRING([--with-z-prefix=PFX],
+ [prefix where the ZLIB library and includes are installed]),
+ [Z_PREFIX=$withval],[Z_PREFIX="$Z_DIR"])
dnl Parse '--enable' command line options
AC_ARG_ENABLE(gsl,
@@ -135,6 +143,32 @@ if test "x$enable_gui" != "xno"; then
fi
fi
+ dnl Check if libz is available (prerequisite for libpng)
+ if test "x${Z_PREFIX}" != "x"; then
+ LDFLAGS="-L${Z_PREFIX} -L${Z_PREFIX}/lib ${LDFLAGS}"
+ fi
+ AC_CHECK_LIB(z,main,Z="yes",Z="no")
+ if test "x${Z}" = "xyes"; then
+ dnl Check if libpng is available to enable/disable gl2png
+ if test "x${PNG_PREFIX}" != "x"; then
+ LDFLAGS="-L${PNG_PREFIX} -L${PNG_PREFIX}/lib ${LDFLAGS}"
+ fi
+ AC_CHECK_LIB(png,main,PNG="yes",PNG="no")
+ if test "x${PNG}" = "xyes"; then
+ FLAGS="-DHAVE_LIBPNG ${FLAGS}"
+ dnl Find the libs/includes even if the libs are _not_ properly installed (ugly hack!)
+ if test "x${PNG_PREFIX}" != "x"; then
+ GMSH_LIBS="${GMSH_LIBS} -L${PNG_PREFIX} -L${PNG_PREFIX}/lib"
+ INCLS="${INCLS} -I${PNG_PREFIX} -I${PNG_PREFIX}/include"
+ fi
+ if test "x${Z_PREFIX}" != "x"; then
+ GMSH_LIBS="${GMSH_LIBS} -L${Z_PREFIX} -L${Z_PREFIX}/lib -lz"
+ INCLS="${INCLS} -I${Z_PREFIX} -I${Z_PREFIX}/include"
+ fi
+ GMSH_LIBS="${GMSH_LIBS} -lpng -lz"
+ fi
+ fi
+
else
GMSH_DIRS="${GMSH_DIRS} Box"
--
GitLab