[Plplot-cvs] plplot/drivers gd.c,1.42,1.43 hpgl.c,1.16,1.17 psttf.cc,1.7,1.8 tek.c,1.50,1.51

[Rafael L. <rla...@us...>]

Update of /cvsroot/plplot/plplot/drivers
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1516/drivers

Modified Files:
	gd.c hpgl.c psttf.cc tek.c 
Log Message:
Sanitized some device enable options:

* cf/drivers-init.ac: Dropped devices psc and psttfc from the list of
  devices.  This means that --enable-psc and --enable-psttfc are dropped
  from the list of options of configure.  This devices are still
  available throught their respective drivers (ps and psttfc).

* cf/psttf.ac:
  - Removed all settings of the enable_psttfc variable, which does not exist
    anymore.
  - Removed unnecessary quotes around bare words "yes" and "no".
  
* drivers/psttf.cc: Use only PLD_psttf

* drivers/hpgl.c, drivers/tek.c: Use #if directives to selectively add
  devices to the plD_DEVICE_INFO_<driver> variables, according to the values
  of the PLD_<device> macros.
  
* drivers/gd.c: Simplified the pre-processor conditionals for setting the
  variable plD_DEVICE_INFO_gd, which was highly convoluted.


Index: gd.c
===================================================================
RCS file: /cvsroot/plplot/plplot/drivers/gd.c,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- gd.c	27 Apr 2005 06:43:46 -0000	1.42
+++ gd.c	18 May 2006 11:56:39 -0000	1.43
@@ -127,36 +127,17 @@
  *  and finally one of each.
  */
 
-#if defined(PLD_png) && defined(PLD_jpeg) && defined(PLD_gif)
-  char* plD_DEVICE_INFO_gd = "jpeg:JPEG file:0:gd:40:jpeg\n"
-                         "png:PNG file:0:gd:39:png\n"
-                         "gif:GIF file:0:gd:47:gif";
-#else
-  #if defined(PLD_png) && defined(PLD_jpeg)
-    char* plD_DEVICE_INFO_gd = "jpeg:JPEG file:0:gd:40:jpeg\n"
-                           "png:PNG file:0:gd:39:png\n";
-  #else
-    #if defined(PLD_png) && defined(PLD_gif)
-      char* plD_DEVICE_INFO_gd = "png:PNG file:0:gd:39:png\n";
-                             "gif:GIF file:0:gd:47:gif";
-    #else
-
-      #if defined(PLD_png)
-      char* plD_DEVICE_INFO_gd = "png:PNG file:0:gd:39:png";
-      #endif
-
-      #if defined(PLD_jpeg)
-      char* plD_DEVICE_INFO_gd = "jpeg:JPEG file:0:gd:40:jpeg";
-      #endif
-  
-      #if defined(PLD_gif)
-      char* plD_DEVICE_INFO_gd = "gif:GIF file:0:gd:47:gif";
-      #endif
-  
-    #endif
-  #endif
+char* plD_DEVICE_INFO_gd = 
+#if defined(PLD_png)
+  "png:PNG file:0:gd:39:png\n"
 #endif
-
+#if defined(PLD_jpeg)
+  "jpeg:JPEG file:0:gd:40:jpeg\n"
+#endif
+#if defined(PLD_gif)
+  "gif:GIF file:0:gd:47:gif"
+#endif
+;
 
 
 #ifdef HAVE_FREETYPE

Index: hpgl.c
===================================================================
RCS file: /cvsroot/plplot/plplot/drivers/hpgl.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- hpgl.c	19 Jan 2004 19:10:19 -0000	1.16
+++ hpgl.c	18 May 2006 11:56:39 -0000	1.17
@@ -38,9 +38,16 @@
 
 /* Device info */
 char* plD_DEVICE_INFO_hpgl =
+#if defined(PLD_hp7470)
   "hp7470:HP 7470 Plotter File (HPGL Cartridge, Small Plotter):0:hpgl:34:hp7470\n"
+#endif
+#if defined(PLD_hp7580)
   "hp7580:HP 7580 Plotter File (Large Plotter):0:hpgl:35:hp7580\n"
-  "lj_hpgl:HP Laserjet III, HPGL emulation mode:0:hpgl:36:lj_hpgl";
+#endif
+#if defined(PLD_lj_hpgl)        
+  "lj_hpgl:HP Laserjet III, HPGL emulation mode:0:hpgl:36:lj_hpgl"
+#endif
+;
 
 
 void plD_line_hpgl		(PLStream *, short, short, short, short);

Index: tek.c
===================================================================
RCS file: /cvsroot/plplot/plplot/drivers/tek.c,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -d -r1.50 -r1.51
--- tek.c	19 Jan 2004 19:10:19 -0000	1.50
+++ tek.c	18 May 2006 11:56:39 -0000	1.51
@@ -24,15 +24,34 @@
 /* Device info */
 
 char* plD_DEVICE_INFO_tek = 
+#if defined(PLD_conex)
   "conex:Conex vt320/tek emulator:1:tek:24:conex\n"
+#ifdef
+#if defined(PLD_mskermit)
   "mskermit:MS-Kermit emulator:1:tek:21:mskermit\n"
+#ifdef
+#if defined(PLD_tek4107t)
   "tek4107t:Tektronix Terminal (4105/4107):1:tek:20:tek4107t\n"
+#ifdef
+#if defined(PLD_tek4107f)
   "tek4107f:Tektronix File (4105/4107):0:tek:28:tek4107f\n"
+#ifdef
+#if defined(PLD_tekt)
   "tekt:Tektronix Terminal (4010):1:tek:19:tekt\n"
+#ifdef
+#if defined(PLD_tekf)
   "tekf:Tektronix File (4010):0:tek:27:tekf\n"
+#ifdef
+#if defined(PLD_versaterm)
   "versaterm:Versaterm vt100/tek emulator:1:tek:22:versaterm\n"
+#ifdef
+#if defined(PLD_vlt)
   "vlt:VLT vt100/tek emulator:1:tek:23:vlt\n"
-  "xterm:Xterm Window:1:tek:18:xterm";
+#ifdef
+#if defined(PLD_xterm)
+  "xterm:Xterm Window:1:tek:18:xterm"
+#ifdef
+;
 
 /* Prototype the driver entry points that will be used to initialize the
    dispatch table entries. */

Index: psttf.cc
===================================================================
RCS file: /cvsroot/plplot/plplot/drivers/psttf.cc,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- psttf.cc	17 May 2006 00:21:45 -0000	1.7
+++ psttf.cc	18 May 2006 11:56:39 -0000	1.8
@@ -33,8 +33,8 @@
 
 #define DEBUG
 
-#if defined(PLD_psttf) ||	/* monochrome device*/ \
-    defined(PLD_psttfc)		/* colour device*/
+#if defined(PLD_psttf)
+
 #define NEED_PLDEBUG
 #include "plplotP.h"
 #include "drivers.h"