diff --git a/Graphics/gl2ps.cpp b/Graphics/gl2ps.cpp index 9953b9a01136196bfd6e1e6f722e0df0993964c1..179ddad1a312cf113394814a74ab836eb66cfff1 100644 --- a/Graphics/gl2ps.cpp +++ b/Graphics/gl2ps.cpp @@ -1,4 +1,4 @@ -/* $Id: gl2ps.cpp,v 1.92 2004-12-21 03:07:00 geuzaine Exp $ */ +/* $Id: gl2ps.cpp,v 1.93 2004-12-29 16:34:38 geuzaine Exp $ */ /* * GL2PS, an OpenGL to PostScript Printing Library * Copyright (C) 1999-2004 Christophe Geuzaine <geuz@geuz.org> @@ -4366,17 +4366,14 @@ static GLint gl2psPrintPrimitives(void) used = glRenderMode(GL_RENDER); - if(used < 0){ - gl2psMsg(GL2PS_INFO, "OpenGL feedback buffer overflow"); - return GL2PS_OVERFLOW; - } - - if(used > 0){ - if(gl2ps->format == GL2PS_PS || - gl2ps->format == GL2PS_EPS || - gl2ps->format == GL2PS_PDF){ - gl2psParseFeedbackBuffer(used); + if(gl2ps->format != GL2PS_TEX){ + /* only report the overflow if we actually parse the buffer! */ + if(used < 0){ + gl2psMsg(GL2PS_INFO, "OpenGL feedback buffer overflow"); + return GL2PS_OVERFLOW; } + if(used > 0) + gl2psParseFeedbackBuffer(used); } if(!gl2psListNbr(gl2ps->primitives)){ @@ -4481,9 +4478,10 @@ GL2PSDLL_API GLint gl2psBeginPage(const char *title, const char *producer, } } - if(!viewport[2] || !viewport[3]){ + if(!gl2ps->viewport[2] || !gl2ps->viewport[3]){ gl2psMsg(GL2PS_ERROR, "Incorrect viewport (x=%d, y=%d, width=%d, height=%d)", - viewport[0], viewport[1], viewport[2], viewport[3]); + gl2ps->viewport[0], gl2ps->viewport[1], + gl2ps->viewport[2], gl2ps->viewport[3]); gl2psFree(gl2ps); gl2ps = NULL; return GL2PS_ERROR; diff --git a/Graphics/gl2ps.h b/Graphics/gl2ps.h index 63962786e18b587e0f1bdce66169bf0b7a66cff3..cf730736aaf247ed8b0ac03f80ea5b2cee011d52 100644 --- a/Graphics/gl2ps.h +++ b/Graphics/gl2ps.h @@ -1,4 +1,4 @@ -/* $Id: gl2ps.h,v 1.55 2004-12-21 03:07:00 geuzaine Exp $ */ +/* $Id: gl2ps.h,v 1.56 2004-12-29 16:34:38 geuzaine Exp $ */ /* * GL2PS, an OpenGL to PostScript Printing Library * Copyright (C) 1999-2004 Christophe Geuzaine <geuz@geuz.org> @@ -77,7 +77,7 @@ #define GL2PS_MAJOR_VERSION 1 #define GL2PS_MINOR_VERSION 2 -#define GL2PS_PATCH_VERSION 3 +#define GL2PS_PATCH_VERSION 4 #define GL2PS_VERSION (GL2PS_MAJOR_VERSION + \ 0.01 * GL2PS_MINOR_VERSION + \ diff --git a/doc/VERSIONS b/doc/VERSIONS index 960bce717676be3deaecf51840dee842c9e5a3c8..cb0262ee4a5c09b2ce87d1db12cc1569003e89ae 100644 --- a/doc/VERSIONS +++ b/doc/VERSIONS @@ -1,11 +1,11 @@ -$Id: VERSIONS,v 1.288 2004-12-29 01:26:01 geuzaine Exp $ +$Id: VERSIONS,v 1.289 2004-12-29 16:34:38 geuzaine Exp $ New since 1.57: new File->Rename menu; new colormaps+improved colormap handling; new color+min/max options in views; new GetValue() function to ask for values interactively in scripts; generalized For/EndFor loops in parser; new plugins (Annotate, Remove, Probe); new text -attributes in views; renamed some shortcuts; various other small -enhancements and bug fixes. +attributes in views; renamed some shortcuts; fixed TeX output for +large scenes; various other small enhancements and bug fixes. New in 1.57: generalized displacement maps to display arbitrary view types; the arrows representing a vector field can now also be colored