head 1.5; access; symbols pkgsrc-2013Q2:1.5.0.40 pkgsrc-2013Q2-base:1.5 pkgsrc-2012Q4:1.5.0.38 pkgsrc-2012Q4-base:1.5 pkgsrc-2011Q4:1.5.0.36 pkgsrc-2011Q4-base:1.5 pkgsrc-2011Q2:1.5.0.34 pkgsrc-2011Q2-base:1.5 pkgsrc-2009Q4:1.5.0.32 pkgsrc-2009Q4-base:1.5 pkgsrc-2008Q4:1.5.0.30 pkgsrc-2008Q4-base:1.5 pkgsrc-2008Q3:1.5.0.28 pkgsrc-2008Q3-base:1.5 cube-native-xorg:1.5.0.26 cube-native-xorg-base:1.5 pkgsrc-2008Q2:1.5.0.24 pkgsrc-2008Q2-base:1.5 pkgsrc-2008Q1:1.5.0.22 pkgsrc-2008Q1-base:1.5 pkgsrc-2007Q4:1.5.0.20 pkgsrc-2007Q4-base:1.5 pkgsrc-2007Q3:1.5.0.18 pkgsrc-2007Q3-base:1.5 pkgsrc-2007Q2:1.5.0.16 pkgsrc-2007Q2-base:1.5 pkgsrc-2007Q1:1.5.0.14 pkgsrc-2007Q1-base:1.5 pkgsrc-2006Q4:1.5.0.12 pkgsrc-2006Q4-base:1.5 pkgsrc-2006Q3:1.5.0.10 pkgsrc-2006Q3-base:1.5 pkgsrc-2006Q2:1.5.0.8 pkgsrc-2006Q2-base:1.5 pkgsrc-2006Q1:1.5.0.6 pkgsrc-2006Q1-base:1.5 pkgsrc-2005Q4:1.5.0.4 pkgsrc-2005Q4-base:1.5 pkgsrc-2005Q3:1.5.0.2 pkgsrc-2005Q3-base:1.5 pkgsrc-2005Q2:1.4.0.4 pkgsrc-2005Q2-base:1.4 pkgsrc-2005Q1:1.4.0.2 pkgsrc-2005Q1-base:1.4 pkgsrc-2004Q4:1.3.0.8 pkgsrc-2004Q4-base:1.3 pkgsrc-2004Q3:1.3.0.6 pkgsrc-2004Q3-base:1.3 pkgsrc-2004Q2:1.3.0.4 pkgsrc-2004Q2-base:1.3 pkgsrc-2004Q1:1.3.0.2 pkgsrc-2004Q1-base:1.3 pkgsrc-2003Q4:1.2.0.2 pkgsrc-2003Q4-base:1.2 buildlink2-base:1.2 netbsd-1-5-PATCH003:1.1.1.1 netbsd-1-5-PATCH001:1.1.1.1 netbsd-1-5-RELEASE:1.1.1.1 netbsd-1-4-PATCH003:1.1.1.1 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.5 date 2005.08.26.09.29.00; author drochner; state dead; branches; next 1.4; 1.4 date 2005.02.25.18.31.43; author drochner; state Exp; branches; next 1.3; 1.3 date 2003.12.03.11.18.05; author markd; state Exp; branches; next 1.2; 1.2 date 2002.05.07.13.18.27; author itohy; state dead; branches; next 1.1; 1.1 date 2000.07.18.07.46.40; author itohy; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2000.07.18.07.46.40; author itohy; state Exp; branches; next ; desc @@ 1.5 log @remove stale patchfiles @ text @$NetBSD: patch-ae,v 1.4 2005/02/25 18:31:43 drochner Exp $ --- drvsk.cpp.orig 2001-11-03 21:18:20.000000000 +0100 +++ drvsk.cpp @@@@ -61,8 +61,8 @@@@ PERFORMANCE OF THIS SOFTWARE. #include #include #include -#if (defined(unix) || defined(__unix__) || defined(_unix) || defined(__unix) || defined(__EMX__) || defined (NetBSD) ) && !defined(DJGPP) -#include +#if (defined(unix) || defined(__unix__) || defined(_unix) || defined(__unix) || defined(__EMX__) || defined (__NetBSD__) ) && !defined(DJGPP) +#include #else #include #endif @@@@ -377,7 +377,7 @@@@ void drvSK::show_image(const Image & ima return; } - ostrstream ppm; + std::ostrstream ppm; switch (imageinfo.type) { case colorimage: @ 1.4 log @check for __NetBSD__, not just NetBSD. fixes build on -current (there is a newer version available, tbd later) @ text @d1 1 a1 1 $NetBSD$ @ 1.3 log @Fix to build with gcc3. @ text @d3 1 a3 1 --- drvsk.cpp.orig 2003-11-18 23:30:30.000000000 +1300 d5 2 a6 1 @@@@ -62,7 +62,7 @@@@ PERFORMANCE OF THIS SOFTWARE. d9 1 a9 1 #if (defined(unix) || defined(__unix__) || defined(_unix) || defined(__unix) || defined(__EMX__) || defined (NetBSD) ) && !defined(DJGPP) d11 1 @ 1.2 log @Update pstoedit to 3.31. Approved by wiz. Tested compilation on i386 (a.out) and alpha (ELF). Note the usage of libtool is not normal. @ text @d1 1 a1 1 $NetBSD: patch-ae,v 1.1 2000/07/18 07:46:40 itohy Exp $ d3 13 a15 49 Don't add spaces at the end of lines since fig2dev (in transfig) doesn't like them. --- drvfig.cpp.orig Mon Jun 5 03:49:29 2000 +++ drvfig.cpp Fri Jul 14 08:28:42 2000 @@@@ -217,19 +217,19 @@@@ // const Point & p; for (unsigned int n = 0; n < numberOfElementsInPath(); n++) { const basedrawingelement & elem = pathElement(n); - if (j == 0) { buffer << "\t"; } + if (j == 0) { buffer << "\t"; } else buffer << " "; switch(elem.getType()) { case lineto: case moveto: { const Point & p = pathElement(n).getPoint(0); buffer << (int)(PntFig * p.x_) << " " - << (int)(y_offset - (PntFig * p.y_)) << " "; + << (int)(y_offset - (PntFig * p.y_)); } break; case closepath: { const Point & p = pathElement(0).getPoint(0); buffer << (int)(PntFig * p.x_) << " " - << (int)(y_offset - (PntFig * p.y_)) << " "; + << (int)(y_offset - (PntFig * p.y_)); } break; default: @@@@ -248,6 +248,10 @@@@ void drvFIG::prpoint(ostream & os, const Point& p) const { os << (int)(PntFig * p.x_) << " " << (int)(y_offset - (PntFig * p.y_)) << " "; } + +void drvFIG::prpointnl(ostream & os, const Point& p) const { + os << (int)(PntFig * p.x_) << " " << (int)(y_offset - (PntFig * p.y_)) << endl; +} // print segments without x-splines void drvFIG::print_spline_coords_noxsplines(int linestyle,float localLineWidth) { @@@@ -275,9 +279,8 @@@@ // 4.0 is the gap spec. we could also derive this from the input buffer << 2 << "\n\t"; prpoint(buffer,currentPoint); - prpoint(buffer,p); + prpointnl(buffer,p); currentPoint=p; - buffer << endl; } break; a16 24 @@@@ -295,9 +298,8 @@@@ prpoint(buffer,currentPoint); prpoint(buffer,elem.getPoint(0)); prpoint(buffer,elem.getPoint(1)); - prpoint(buffer,elem.getPoint(2)); + prpointnl(buffer,elem.getPoint(2)); currentPoint=elem.getPoint(2); - buffer << endl; // 32 buffer << "\n\t0.000 1.000 1.000 0.000" << endl; break; } @@@@ -312,9 +314,8 @@@@ // 4.0 is the gap spec. we could also derive this from the input buffer << 2 << "\n\t"; prpoint(buffer,currentPoint); - prpoint(buffer,firstPoint); + prpointnl(buffer,firstPoint); currentPoint=firstPoint; - buffer << endl; break; } break; @@@@ -332,14 +333,14 @@@@ int j = 0; d18 5 a22 156 for (unsigned int n = 0; n < numberOfElementsInPath(); n++) { - if (j == 0) { buffer << "\t"; } + if (j == 0) { buffer << "\t"; } else { buffer << " "; } const basedrawingelement & elem = pathElement(n); switch (elem.getType()) { case moveto: case lineto: { const Point & p = elem.getPoint(0); buffer << (int)(PntFig * p.x_) << " " - << (int)(y_offset - (PntFig * p.y_)) << " "; + << (int)(y_offset - (PntFig * p.y_)); } j++; if (j == 5) { j=0; buffer << "\n"; } break; @@@@ -347,16 +348,17 @@@@ if ((format == 31)) { const Point & p = elem.getPoint(2); buffer << (int)(PntFig * p.x_) << " " - << (int)(y_offset - (PntFig * p.y_)) << " "; + << (int)(y_offset - (PntFig * p.y_)); j++; if (j == 5) { j=0; buffer << "\n"; } } else { // put all points, middle points will have control value 1 for (unsigned int cp = 0 ; cp < 3; cp++ ) { const Point & p = elem.getPoint(cp); buffer << (int)(PntFig * p.x_) << " " - << (int)(y_offset - (PntFig * p.y_)) << " "; + << (int)(y_offset - (PntFig * p.y_)); j++; if (j == 5) { j=0; buffer << "\n"; } if ((j == 0) && (cp != 2) && ( n+1 != (numberOfElementsInPath()))) { buffer << "\t"; } + if ((j != 0) && (cp != 2) && ( n+1 != (numberOfElementsInPath()))) { buffer << " "; } } } } @@@@ -364,7 +366,7 @@@@ case closepath: { const Point & p = pathElement(0).getPoint(0); buffer << (int)(PntFig * p.x_) << " " - << (int)(y_offset - (PntFig * p.y_)) << " "; + << (int)(y_offset - (PntFig * p.y_)); } j++; if (j == 5) { j=0; buffer << "\n"; } break; @@@@ -397,14 +399,14 @@@@ switch (elem.getType()) { case moveto: { if (format == 31) { - buffer << "\t0.0 0.0 "; + buffer << "\t0.0 0.0"; } else { - buffer << " 0 "; + buffer << " 0"; } j++; if (j == maxj) { j=0; buffer << "\n"; if ( (n+1) != numberOfElementsInPath()) { buffer << "\t"; } - } + } else if (n+1 != numberOfElementsInPath()) { buffer << " "; } lastp = elem.getPoint(0); } break; @@@@ -412,23 +414,23 @@@@ if (format == 31) { const Point & p = elem.getPoint(0); buffer << (float)(PntFig * lastp.x_) << " " - << (float)(y_offset - (PntFig * lastp.y_)) << " "; + << (float)(y_offset - (PntFig * lastp.y_)); j++; if (j == maxj) { j=0; buffer << "\n\t"; - } + } else if (n+1 != numberOfElementsInPath()) { buffer << " "; } buffer << (float)(PntFig * p.x_) << " " - << (float)(y_offset - (PntFig * p.y_)) << " "; + << (float)(y_offset - (PntFig * p.y_)); j++; if (j == maxj) { j=0; buffer << "\n"; if ( (n+1) != numberOfElementsInPath()) { buffer << "\t"; } - } + } else if (n+1 != numberOfElementsInPath()) { buffer << " "; } lastp = elem.getPoint(0); } else { - buffer << " 0 "; + buffer << " 0"; j++; if (j == maxj) { j=0; buffer << "\n"; if ((n+1) != numberOfElementsInPath()) { buffer << "\t"; } - } + } else if (n+1 != numberOfElementsInPath()) { buffer << " "; } } } break; @@@@ -436,23 +438,23 @@@@ if (format == 31) { const Point & p = pathElement(0).getPoint(0); buffer << (float)(PntFig * lastp.x_) << " " - << (float)(y_offset - (PntFig * lastp.y_)) << " "; + << (float)(y_offset - (PntFig * lastp.y_)); j++; if (j == maxj) { j=0; buffer << "\n\t"; - } + } else buffer << " "; buffer << (float)(PntFig * p.x_) << " " - << (float)(y_offset - (PntFig * p.y_)) << " "; + << (float)(y_offset - (PntFig * p.y_)); j++; if (j == maxj) { j=0; buffer << "\n"; if ( (n+1) != numberOfElementsInPath()) { buffer << "\t"; } - } + } else if (n+1 != numberOfElementsInPath()) { buffer << " "; } lastp = pathElement(0).getPoint(0); } else { - buffer << " 0 "; + buffer << " 0"; j++; if (j == maxj) { j=0; buffer << "\n"; if ( (n+1) != numberOfElementsInPath()) { buffer << "\t"; } - } + } else if (n+1 != numberOfElementsInPath()) { buffer << " "; } } } break; @@@@ -461,21 +463,21 @@@@ for (unsigned int cp = 0 ; cp < 2; cp++ ) { const Point & p = elem.getPoint(cp); buffer << (float)(PntFig * p.x_) << " " - << (float)(y_offset - (PntFig * p.y_)) << " "; + << (float)(y_offset - (PntFig * p.y_)); j++; if (j == maxj) { j=0; buffer << "\n"; if (!((cp == 2) && ( (n+1) == numberOfElementsInPath()))) { buffer << "\t"; } - } + } else if (n+1 != numberOfElementsInPath()) { buffer << " "; } } } else { // put all points, middle points will have control value 1 const char * sk = "110"; for (unsigned int i = 0 ; i < 3; i++ ){ - buffer << " " << sk[i] << " "; + buffer << " " << sk[i]; j++; if (j == maxj) { j=0; buffer << "\n"; if (!((i == 2) && ((n+1) == numberOfElementsInPath()))) { buffer << "\t"; } - } + } else if (!(i == 2 && n+1 == numberOfElementsInPath())) { buffer << " "; } } } lastp = elem.getPoint(2); @@@@ -488,7 +490,7 @@@@ } } if (format == 31) { - if (j == maxj) { j=0; buffer << "\n\t"; } + if (j == maxj) { j=0; buffer << "\n\t"; } else buffer << " "; buffer << "0.0 0.0\n"; } else { if (j != 0) { buffer << endl; } @ 1.1 log @Initial revision @ text @d1 1 a1 1 $NetBSD$ @ 1.1.1.1 log @pstoedit, a converter from PostScript and PDF files to other vector graphic formats, including fig (xfig, transfig), tgif .obj, DXF (CAD exchange format), PIC (troff), LaTeX2e picture, and etc. Some files may not be converted. International characters may be broken into polylines and splines, but would be better than nothing. @ text @@