From f4ac6f02009ef7f85d6e00d43b76bb0c39af4bf9 Mon Sep 17 00:00:00 2001 From: joye Date: Tue, 3 Jun 2014 19:30:16 +0000 Subject: *** empty log message *** --- src/bltGrPSOutput.C | 18 +++++++++--------- src/bltGrPSOutput.h | 12 ++++++------ 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/bltGrPSOutput.C b/src/bltGrPSOutput.C index 6d76a2a..cd10076 100644 --- a/src/bltGrPSOutput.C +++ b/src/bltGrPSOutput.C @@ -52,12 +52,12 @@ PostScript::PostScript(Graph* graphPtr) { graphPtr_ = graphPtr; - Tcl_DStringInit(&dString); + Tcl_DStringInit(&dString_); } PostScript::~PostScript() { - Tcl_DStringFree(&dString); + Tcl_DStringFree(&dString_); } void PostScript::drawPolyline(Point2d* screenPts, int nScreenPts) @@ -159,13 +159,13 @@ int PostScript::computeBBox(int width, int height) const char* PostScript::getValue(int* lengthPtr) { - *lengthPtr = strlen(Tcl_DStringValue(&dString)); - return Tcl_DStringValue(&dString); + *lengthPtr = strlen(Tcl_DStringValue(&dString_)); + return Tcl_DStringValue(&dString_); } void PostScript::append(const char* string) { - Tcl_DStringAppend(&dString, string, -1); + Tcl_DStringAppend(&dString_, string, -1); } void PostScript::format(const char* fmt, ...) @@ -173,9 +173,9 @@ void PostScript::format(const char* fmt, ...) va_list argList; va_start(argList, fmt); - vsnprintf(scratchArr, POSTSCRIPT_BUFSIZ, fmt, argList); + vsnprintf(scratchArr_, POSTSCRIPT_BUFSIZ, fmt, argList); va_end(argList); - Tcl_DStringAppend(&dString, scratchArr, -1); + Tcl_DStringAppend(&dString_, scratchArr_, -1); } void PostScript::varAppend(const char* fmt, ...) @@ -187,7 +187,7 @@ void PostScript::varAppend(const char* fmt, ...) char* str = va_arg(argList, char *); if (!str) break; - Tcl_DStringAppend(&dString, str, -1); + Tcl_DStringAppend(&dString_, str, -1); } va_end(argList); } @@ -473,7 +473,7 @@ int PostScript::includeFile(const char *fileName) int nBytes; Tcl_Interp* interp = graphPtr_->interp_; - char* buf = scratchArr; + char* buf = scratchArr_; // Read in a standard prolog file from file and append it to the // PostScript output stored in the Tcl_DString in psPtr. diff --git a/src/bltGrPSOutput.h b/src/bltGrPSOutput.h index 7548575..2b1cea7 100644 --- a/src/bltGrPSOutput.h +++ b/src/bltGrPSOutput.h @@ -39,16 +39,19 @@ class Graph; class PageSetup; class PostScript { - public: + protected: Graph* graphPtr_; - Tcl_DString dString; - char scratchArr[POSTSCRIPT_BUFSIZ+1]; + Tcl_DString dString_; + char scratchArr_[POSTSCRIPT_BUFSIZ+1]; protected: void addComments(const char**); void XColorToPostScript(XColor*); unsigned char reverseBits(unsigned char); void byteToHex(unsigned char, char*); + void setJoinStyle(int); + void setCapStyle(int); + int includeFile(const char*); public: PostScript(Graph*); @@ -75,8 +78,6 @@ class PostScript { void setLineAttributes(XColor*,int, Dashes*, int, int); void setClearBackground(); void setDashes(Dashes*); - void setJoinStyle(int); - void setCapStyle(int); void setBitmap(Display*, Pixmap, int, int); int preamble(const char*); @@ -85,7 +86,6 @@ class PostScript { void append(const char*); void format(const char*, ...); void varAppend(const char*, ...); - int includeFile(const char*); }; #endif -- cgit v0.12