From 53f7e70930d3d1469e4e20a0d05f25a1611e6bd9 Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Tue, 20 Nov 2001 08:04:59 +0000
Subject: [PATCH] *** empty log message ***
---
Fltk/GUI.cpp | 10 +++++-----
Graphics/gl2ps.cpp | 10 ++++++----
Makefile | 4 ++--
3 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/Fltk/GUI.cpp b/Fltk/GUI.cpp
index 36a0ec387c..74388009e7 100644
--- a/Fltk/GUI.cpp
+++ b/Fltk/GUI.cpp
@@ -1,4 +1,4 @@
-// $Id: GUI.cpp,v 1.133 2001-11-19 14:40:25 geuzaine Exp $
+// $Id: GUI.cpp,v 1.134 2001-11-20 08:04:59 geuzaine Exp $
// To make the interface as visually consistent as possible, please:
// - use the IW, BB, BH, BW and WB values
@@ -67,10 +67,10 @@ Fl_Menu_Item m_menubar_table[] = {
{"PostScript, fast (ps)...", 0, (Fl_Callback *)file_save_as_ps_simple_cb, 0},
{"PostScript, accurate...", 0, (Fl_Callback *)file_save_as_ps_accurate_cb, 0},
{"Jpeg (jpg)...", 0, (Fl_Callback *)file_save_as_jpeg_cb, 0},
- {"LaTeX, PS part, fast (pstex)...", 0, (Fl_Callback *)file_save_as_pstex_simple_cb, 0},
- {"LaTeX, PS part, accurate...", 0, (Fl_Callback *)file_save_as_pstex_accurate_cb, 0},
- {"LaTeX, Jpeg part (jpegtex)...", 0, (Fl_Callback *)file_save_as_jpegtex_cb, 0},
- {"LaTeX, TeX part (tex)...", 0, (Fl_Callback *)file_save_as_tex_cb, 0},
+ {"LaTeX, PS part, fast...", 0, (Fl_Callback *)file_save_as_pstex_simple_cb, 0},
+ {"LaTeX, PS part, accurate...", 0, (Fl_Callback *)file_save_as_pstex_accurate_cb, 0},
+ {"LaTeX, Jpeg part...", 0, (Fl_Callback *)file_save_as_jpegtex_cb, 0},
+ {"LaTeX, TeX part (tex)...", 0, (Fl_Callback *)file_save_as_tex_cb, 0},
{"GIF (gif)...", 0, (Fl_Callback *)file_save_as_gif_cb, 0},
{"GIF, dithered...", 0, (Fl_Callback *)file_save_as_gif_dithered_cb, 0},
{"GIF, transparent...", 0, (Fl_Callback *)file_save_as_gif_transparent_cb, 0},
diff --git a/Graphics/gl2ps.cpp b/Graphics/gl2ps.cpp
index ddeb843960..70c17d1651 100644
--- a/Graphics/gl2ps.cpp
+++ b/Graphics/gl2ps.cpp
@@ -1,10 +1,8 @@
-#include "Gmsh.h"
-#include "GmshUI.h"
/*
* GL2PS, an OpenGL to PostScript Printing Library
* Copyright (C) 1999-2001 Christophe Geuzaine
*
- * $Id: gl2ps.cpp,v 1.33 2001-11-19 14:24:02 geuzaine Exp $
+ * $Id: gl2ps.cpp,v 1.34 2001-11-20 08:04:59 geuzaine Exp $
*
* E-mail: Christophe.Geuzaine@AdValvas.be
* URL: http://www.geuz.org/gl2ps/
@@ -1473,7 +1471,11 @@ GLvoid gl2psText(char *str, char *fontname, GLint fontsize){
strcpy(prim->text->str, str);
prim->text->fontname = fontname;
prim->text->fontsize = fontsize;
- gl2psListAdd(gl2ps.primitives, &prim);
+
+ if(!gl2ps.primitives)
+ gl2psMsg(GL2PS_ERROR, "gl2psText should be called inside gl2psBeginPage/gl2psEndPage");
+ else
+ gl2psListAdd(gl2ps.primitives, &prim);
}
GLvoid gl2psEnable(GLint mode){
diff --git a/Makefile b/Makefile
index f56bb937c1..114c6e4196 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.164 2001-11-19 14:43:40 geuzaine Exp $
+# $Id: Makefile,v 1.165 2001-11-20 08:04:59 geuzaine Exp $
GMSH_MAJOR_VERSION = 1
GMSH_MINOR_VERSION = 31
@@ -253,7 +253,7 @@ compile_linux:
@for i in $(GMSH_FLTK_DIR); do (cd $$i && $(MAKE) \
"CXX=$(CXX)" \
"CC=$(CC)" \
- "OPT_FLAGS=-g -O2 -Wall" \
+ "OPT_FLAGS=-g -O2 -Wall -Wno-uninitialized" \
"OS_FLAGS=-D_LITTLE_ENDIAN" \
"VERSION_FLAGS=-D_FLTK" \
"GL_INCLUDE=" \
--
GitLab