Menu
▾
▴
plplot-cvs
|
From: <ai...@us...> - 2008-10-10 21:47:32
|
Revision: 8879
http://plplot.svn.sourceforge.net/plplot/?rev=8879&view=rev
Author: airwin
Date: 2008-10-10 21:47:29 +0000 (Fri, 10 Oct 2008)
Log Message:
-----------
Make plRemakePlot, ucs4_to_utf8, and plP_fci2hex externally visible for
libplplot so that some of the device drivers can use them.
Modified Paths:
--------------
trunk/include/drivers.h
trunk/include/plplotP.h
Modified: trunk/include/drivers.h
===================================================================
--- trunk/include/drivers.h 2008-10-10 20:35:15 UTC (rev 8878)
+++ trunk/include/drivers.h 2008-10-10 21:47:29 UTC (rev 8879)
@@ -110,7 +110,7 @@
void * plbuf_save (PLStream *, void *);
void * plbuf_switch (PLStream *, void *);
-void plRemakePlot (PLStream *);
+PLDLLIMPEXP void plRemakePlot (PLStream *);
#ifdef __cplusplus
}
Modified: trunk/include/plplotP.h
===================================================================
--- trunk/include/plplotP.h 2008-10-10 20:35:15 UTC (rev 8878)
+++ trunk/include/plplotP.h 2008-10-10 21:47:29 UTC (rev 8879)
@@ -461,7 +461,7 @@
plP_hex2fci(unsigned char hexdigit, unsigned char hexpower, PLUNICODE *pfci);
/* Retrieves hex digit value from FCI (font characterization integer). */
-void
+PLDLLIMPEXP void
plP_fci2hex(PLUNICODE fci, unsigned char *phexdigit, unsigned char hexpower);
/* Pattern fills in software the polygon bounded by the input points. */
@@ -502,7 +502,7 @@
/* A replacement for strdup(), which isn't portable. */
-char PLDLLIMPEXP *
+PLDLLIMPEXP char *
plstrdup(const char *src);
/* Bin up cmap 1 space and assign colors to make inverse mapping easy. */
@@ -978,7 +978,7 @@
void
grimage(short *x, short *y, unsigned short *z, PLINT nx, PLINT ny);
-int PLDLLIMPEXP
+PLDLLIMPEXP int
plInBuildTree();
void
@@ -997,7 +997,7 @@
* and vector transformations.
* This is not currently intended to be called direct by the user
*/
-void PLDLLIMPEXP
+PLDLLIMPEXP void
plfvect(PLFLT (*plf2eval) (PLINT, PLINT, PLPointer),
PLPointer f2evalv_data, PLPointer f2evalc_data,
PLINT nx, PLINT ny, PLFLT scale,
@@ -1028,7 +1028,7 @@
plP_FreeDrvOpts();
/* Convert a ucs4 unichar to utf8 char string*/
-int
+PLDLLIMPEXP int
ucs4_to_utf8(PLUNICODE unichar, char *ptr);
/*
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sm...@us...> - 2009-02-27 21:24:54
|
Revision: 9632
http://plplot.svn.sourceforge.net/plplot/?rev=9632&view=rev
Author: smekal
Date: 2009-02-27 21:24:47 +0000 (Fri, 27 Feb 2009)
Log Message:
-----------
The macros regarding dirent where moved from plplotP.h to plcore.c, since dirent is only used there. This is more efficient for Visual C++ where dirent_msvc.h was always included (with code) and dirent_msvc.h doesn't need to be installed into the install tree anymore.
Modified Paths:
--------------
trunk/include/CMakeLists.txt
trunk/include/plplotP.h
Modified: trunk/include/CMakeLists.txt
===================================================================
--- trunk/include/CMakeLists.txt 2009-02-27 21:20:10 UTC (rev 9631)
+++ trunk/include/CMakeLists.txt 2009-02-27 21:24:47 UTC (rev 9632)
@@ -73,7 +73,4 @@
${CMAKE_CURRENT_BINARY_DIR}/plConfig.h
${CMAKE_CURRENT_BINARY_DIR}/plDevs.h
)
-if(MSVC)
- set(include_INSTALLED_HEADERS ${include_INSTALLED_HEADERS} dirent_msvc.h)
-endif(MSVC)
install(FILES ${include_INSTALLED_HEADERS} DESTINATION ${INCLUDE_DIR})
Modified: trunk/include/plplotP.h
===================================================================
--- trunk/include/plplotP.h 2009-02-27 21:20:10 UTC (rev 9631)
+++ trunk/include/plplotP.h 2009-02-27 21:24:47 UTC (rev 9632)
@@ -127,33 +127,6 @@
#define M_PI 3.14159265358979323846
#endif
-#if HAVE_DIRENT_H
-/* The following conditional is a workaround for a bug in the MacOSX system.
- When the dirent.h file will be fixed upstream by Apple Inc, this should
- go away. */
-# ifdef NEED_SYS_TYPE_H
-# include <sys/types.h>
-# endif
-# include <dirent.h>
-# define NAMLEN(dirent) strlen((dirent)->d_name)
-#else
-# if defined(_MSC_VER)
-# include "dirent_msvc.h"
-# else
-# define dirent direct
-# define NAMLEN(dirent) (dirent)->d_namlen
-# if HAVE_SYS_NDIR_H
-# include <sys/ndir.h>
-# endif
-# if HAVE_SYS_DIR_H
-# include <sys/dir.h>
-# endif
-# if HAVE_NDIR_H
-# include <ndir.h>
-# endif
-# endif
-#endif
-
/*
* Macros for file positioning. I tried switching to f[sg]etpos() because I
* like the semantics better, but ran into the problem that fpos_t is not
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sm...@us...> - 2009-03-19 12:07:42
|
Revision: 9755
http://plplot.svn.sourceforge.net/plplot/?rev=9755&view=rev
Author: smekal
Date: 2009-03-19 12:07:35 +0000 (Thu, 19 Mar 2009)
Log Message:
-----------
Changes in pldll.h to correctly export symbols from qt driver.
Simplify definition of PLINT_MIN for MSVC compiler.
Modified Paths:
--------------
trunk/include/pldll.h
trunk/include/plplot.h
Modified: trunk/include/pldll.h
===================================================================
--- trunk/include/pldll.h 2009-03-19 12:05:34 UTC (rev 9754)
+++ trunk/include/pldll.h 2009-03-19 12:07:35 UTC (rev 9755)
@@ -55,7 +55,7 @@
defined(pstex_EXPORTS) || defined(psttf_EXPORTS) || defined(svg_EXPORTS) || \
defined(tek_EXPORTS) || defined(tk_EXPORTS) || defined(tkwin_EXPORTS) || \
defined(wingcc_EXPORTS) || defined(wxwidgets_EXPORTS) || defined(xfig_EXPORTS) || \
- defined(xwin_EXPORTS)
+ defined(xwin_EXPORTS) || defined(qt_EXPORTS)
#define PLDLLIMPEXP_DRIVER PLDLLEXPORT
#define PLDLLIMPEXP_DRIVER_DATA(type) PLDLLEXPORT type
#else
Modified: trunk/include/plplot.h
===================================================================
--- trunk/include/plplot.h 2009-03-19 12:05:34 UTC (rev 9754)
+++ trunk/include/plplot.h 2009-03-19 12:07:35 UTC (rev 9755)
@@ -171,13 +171,9 @@
PLINT_MIN is unsigned and 2147483648 NOT -2147483648, see
http://msdn.microsoft.com/en-us/library/4kh09110(VS.71).aspx for
details */
-#ifdef _MSC_VER
- #if _MSC_VER>1309
- #include <Limits.h>
- #define PLINT_MIN INT_MIN
- #else
- #define PLINT_MIN -2147483648
- #endif
+#if defined(_MSC_VER) && _MSC_VER >= 1310
+ #include <Limits.h>
+ #define PLINT_MIN INT_MIN
#else
#define PLINT_MIN -2147483648
#endif
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2009-04-24 06:54:56
|
Revision: 9843
http://plplot.svn.sourceforge.net/plplot/?rev=9843&view=rev
Author: airwin
Date: 2009-04-24 06:54:55 +0000 (Fri, 24 Apr 2009)
Log Message:
-----------
Convert pldll.h to a file which is configured from pldll.h.in. This change
is necessary since some of the visibility logic depends on the configured
value of LIB_TAG.
Modified Paths:
--------------
trunk/include/CMakeLists.txt
Added Paths:
-----------
trunk/include/pldll.h.in
Removed Paths:
-------------
trunk/include/pldll.h
Modified: trunk/include/CMakeLists.txt
===================================================================
--- trunk/include/CMakeLists.txt 2009-04-24 05:39:57 UTC (rev 9842)
+++ trunk/include/CMakeLists.txt 2009-04-24 06:54:55 UTC (rev 9843)
@@ -29,6 +29,11 @@
${CMAKE_CURRENT_BINARY_DIR}/plDevs.h
)
+configure_file(
+${CMAKE_CURRENT_SOURCE_DIR}/pldll.h.in
+${CMAKE_CURRENT_BINARY_DIR}/pldll.h
+)
+
set(plhershey-unicode-gen_SRCS
${CMAKE_SOURCE_DIR}/fonts/plhershey-unicode-gen.c
)
@@ -65,7 +70,7 @@
drivers.h
pdf.h
pldebug.h
-pldll.h
+${CMAKE_CURRENT_BINARY_DIR}/pldll.h
plevent.h
plplot.h
plplotP.h
Deleted: trunk/include/pldll.h
===================================================================
--- trunk/include/pldll.h 2009-04-24 05:39:57 UTC (rev 9842)
+++ trunk/include/pldll.h 2009-04-24 06:54:55 UTC (rev 9843)
@@ -1,142 +0,0 @@
-#ifndef __PL_DLL_H
-#define __PL_DLL_H
-
-#ifdef USINGDLL
- #if defined(WIN32)
- /* Visual C/C++, Borland, MinGW and Watcom */
- #if defined(__VISUALC__) || defined(_MSC_VER) || defined(__BORLANDC__) || defined(__GNUC__) || defined(__WATCOMC__)
- #define PLDLLEXPORT __declspec(dllexport)
- #define PLDLLIMPORT __declspec(dllimport)
- #else
- #define PLDLLEXPORT
- #define PLDLLIMPORT
- #endif
- #elif defined(__CYGWIN__)
- #define PLDLLEXPORT __declspec(dllexport)
- #define PLDLLIMPORT __declspec(dllimport)
- #elif defined(__GNUC__) && __GNUC__ > 3
- /* Follow ideas in http://gcc.gnu.org/wiki/Visibility for GCC version 4.x
- * The following forces exported symbols specifically designated with
- * PLDLLEXPORT to be visible. */
- #define PLDLLEXPORT __attribute__ ((visibility("default")))
- #define PLDLLIMPORT
- #endif
-#endif
-
-/* For an unknown compiler or static built we clear the macros */
-#ifndef PLDLLEXPORT
- #define PLDLLEXPORT
- #define PLDLLIMPORT
-#endif
-
-/* The IMPEXP macros will always be set to DLLIMPORT (even for
- the static library, but DLLIMPORT is empty in this case), if
- cmake didn't set the corresponding macro xxxx_EXPORTS when the
- corresponding library is built (DLLIMPEXP is set to DLLEXPORT
- then) */
-#if defined(plplotd_EXPORTS)
- #define PLDLLIMPEXP PLDLLEXPORT
- #define PLDLLIMPEXP_DATA(type) PLDLLEXPORT type
-#else
- #define PLDLLIMPEXP PLDLLIMPORT
- #define PLDLLIMPEXP_DATA(type) PLDLLIMPORT type
-#endif
-
-/* for dynamic drivers set the macros correctly. If a shared library is built,
- but dyanmic drivers disabled, the driver dll macros are the same as the
- plplot dll macros */
-#ifdef ENABLE_DYNDRIVERS
- #if defined(aqt_EXPORTS) || defined(cairo_EXPORTS) || defined(cgm_EXPORTS) || \
- defined(dg300_EXPORTS) || defined(gd_EXPORTS) || defined(gcw_EXPORTS) || \
- defined(hpgl_EXPORTS) || defined(impress_EXPORTS) || defined(linuxvga_EXPORTS) || \
- defined(ljii_EXPORTS) || defined(ljiip_EXPORTS) || defined(mem_EXPORTS) || \
- defined(ntk_EXPORTS) || defined(null_EXPORTS) || defined(pbm_EXPORTS) || \
- defined(pdf_EXPORTS) || defined(plmeta_EXPORTS) || defined(ps_EXPORTS) || \
- defined(pstex_EXPORTS) || defined(psttf_EXPORTS) || defined(svg_EXPORTS) || \
- defined(tek_EXPORTS) || defined(tk_EXPORTS) || defined(tkwin_EXPORTS) || \
- defined(wingcc_EXPORTS) || defined(wxwidgets_EXPORTS) || defined(xfig_EXPORTS) || \
- defined(xwin_EXPORTS) || defined(qt_EXPORTS)
- #define PLDLLIMPEXP_DRIVER PLDLLEXPORT
- #define PLDLLIMPEXP_DRIVER_DATA(type) PLDLLEXPORT type
- #else
- #define PLDLLIMPEXP_DRIVER PLDLLIMPORT
- #define PLDLLIMPEXP_DRIVER_DATA(type) PLDLLIMPORT type
- #endif
-#else
- #define PLDLLIMPEXP_DRIVER PLDLLIMPEXP
- #define PLDLLIMPEXP_DRIVER_DATA(type) PLDLLIMPEXP_DATA(type)
-#endif
-
-#if defined(plplotcxxd_EXPORTS)
- #define PLDLLIMPEXP_CXX PLDLLEXPORT
- #define PLDLLIMPEXP_CXX_DATA(type) PLDLLEXPORT type
-#else
- #define PLDLLIMPEXP_CXX PLDLLIMPORT
- #define PLDLLIMPEXP_CXX_DATA(type) PLDLLIMPORT type
-#endif
-
-#if defined(plplotf77cd_EXPORTS)
- #define PLDLLIMPEXP_F77C PLDLLEXPORT
- #define PLDLLIMPEXP_F77C_DATA(type) PLDLLEXPORT type
-#else
- #define PLDLLIMPEXP_F77C PLDLLIMPORT
- #define PLDLLIMPEXP_F77C_DATA(type) PLDLLIMPORT type
-#endif
-
-#if defined(plplotf95cd_EXPORTS)
- #define PLDLLIMPEXP_F95C PLDLLEXPORT
- #define PLDLLIMPEXP_F95C_DATA(type) PLDLLEXPORT type
-#else
- #define PLDLLIMPEXP_F95C PLDLLIMPORT
- #define PLDLLIMPEXP_F95C_DATA(type) PLDLLIMPORT type
-#endif
-
-#if defined(plplotwxwidgetsd_EXPORTS)
- #define PLDLLIMPEXP_WX PLDLLEXPORT
- #define PLDLLIMPEXP_WX_DATA(type) PLDLLEXPORT type
-#else
- #define PLDLLIMPEXP_WX PLDLLIMPORT
- #define PLDLLIMPEXP_WX_DATA(type) PLDLLIMPORT type
-#endif
-
-#if defined(tclmatrixd_EXPORTS)
- #define PLDLLIMPEXP_TCLMAT PLDLLEXPORT
- #define PLDLLIMPEXP_TCLMAT_DATA(type) PLDLLEXPORT type
-#else
- #define PLDLLIMPEXP_TCLMAT PLDLLIMPORT
- #define PLDLLIMPEXP_TCLMAT_DATA(type) PLDLLIMPORT type
-#endif
-
-#if defined(plplottcltkd_EXPORTS)
- #define PLDLLIMPEXP_TCLTK PLDLLEXPORT
- #define PLDLLIMPEXP_TCLTK_DATA(type) PLDLLEXPORT type
-#else
- #define PLDLLIMPEXP_TCLTK PLDLLIMPORT
- #define PLDLLIMPEXP_TCLTK_DATA(type) PLDLLIMPORT type
-#endif
-
-#if defined(plplotgnome2d_EXPORTS)
- #define PLDLLIMPEXP_GNOME2 PLDLLEXPORT
- #define PLDLLIMPEXP_GNOME2_DATA(type) PLDLLEXPORT type
-#else
- #define PLDLLIMPEXP_GNOME2 PLDLLIMPORT
- #define PLDLLIMPEXP_GNOME2_DATA(type) PLDLLIMPORT type
-#endif
-
-#if defined(cplplotcanvasmodule_EXPORTS)
- #define PLDLLIMPEXP_CPLPLOTCANVASMODULE PLDLLEXPORT
- #define PLDLLIMPEXP_CPLPLOTCANVASMODULE_DATA(type) PLDLLEXPORT type
-#else
- #define PLDLLIMPEXP_CPLPLOTCANVASMODULE PLDLLIMPORT
- #define PLDLLIMPEXP_CPLPLOTCANVASMODULE_DATA(type) PLDLLIMPORT type
-#endif
-
-#if defined(plplot_widgetmodule_EXPORTS)
- #define PLDLLIMPEXP_PLPLOT_WIDGETMODULE PLDLLEXPORT
- #define PLDLLIMPEXP_PLPLOT_MODULE_DATA(type) PLDLLEXPORT type
-#else
- #define PLDLLIMPEXP_PLPLOT_MODULE PLDLLIMPORT
- #define PLDLLIMPEXP_PLPLOT_MODULE_DATA(type) PLDLLIMPORT type
-#endif
-
-#endif /* __PL_DLL_H */
Copied: trunk/include/pldll.h.in (from rev 9841, trunk/include/pldll.h)
===================================================================
--- trunk/include/pldll.h.in (rev 0)
+++ trunk/include/pldll.h.in 2009-04-24 06:54:55 UTC (rev 9843)
@@ -0,0 +1,142 @@
+#ifndef __PL_DLL_H
+#define __PL_DLL_H
+
+#ifdef USINGDLL
+ #if defined(WIN32)
+ /* Visual C/C++, Borland, MinGW and Watcom */
+ #if defined(__VISUALC__) || defined(_MSC_VER) || defined(__BORLANDC__) || defined(__GNUC__) || defined(__WATCOMC__)
+ #define PLDLLEXPORT __declspec(dllexport)
+ #define PLDLLIMPORT __declspec(dllimport)
+ #else
+ #define PLDLLEXPORT
+ #define PLDLLIMPORT
+ #endif
+ #elif defined(__CYGWIN__)
+ #define PLDLLEXPORT __declspec(dllexport)
+ #define PLDLLIMPORT __declspec(dllimport)
+ #elif defined(__GNUC__) && __GNUC__ > 3
+ /* Follow ideas in http://gcc.gnu.org/wiki/Visibility for GCC version 4.x
+ * The following forces exported symbols specifically designated with
+ * PLDLLEXPORT to be visible. */
+ #define PLDLLEXPORT __attribute__ ((visibility("default")))
+ #define PLDLLIMPORT
+ #endif
+#endif
+
+/* For an unknown compiler or static built we clear the macros */
+#ifndef PLDLLEXPORT
+ #define PLDLLEXPORT
+ #define PLDLLIMPORT
+#endif
+
+/* The IMPEXP macros will always be set to DLLIMPORT (even for
+ the static library, but DLLIMPORT is empty in this case), if
+ cmake didn't set the corresponding macro xxxx_EXPORTS when the
+ corresponding library is built (DLLIMPEXP is set to DLLEXPORT
+ then) */
+#if defined(plplot${LIB_TAG}_EXPORTS)
+ #define PLDLLIMPEXP PLDLLEXPORT
+ #define PLDLLIMPEXP_DATA(type) PLDLLEXPORT type
+#else
+ #define PLDLLIMPEXP PLDLLIMPORT
+ #define PLDLLIMPEXP_DATA(type) PLDLLIMPORT type
+#endif
+
+/* for dynamic drivers set the macros correctly. If a shared library is built,
+ but dyanmic drivers disabled, the driver dll macros are the same as the
+ plplot dll macros */
+#ifdef ENABLE_DYNDRIVERS
+ #if defined(aqt_EXPORTS) || defined(cairo_EXPORTS) || defined(cgm_EXPORTS) || \
+ defined(dg300_EXPORTS) || defined(gd_EXPORTS) || defined(gcw_EXPORTS) || \
+ defined(hpgl_EXPORTS) || defined(impress_EXPORTS) || defined(linuxvga_EXPORTS) || \
+ defined(ljii_EXPORTS) || defined(ljiip_EXPORTS) || defined(mem_EXPORTS) || \
+ defined(ntk_EXPORTS) || defined(null_EXPORTS) || defined(pbm_EXPORTS) || \
+ defined(pdf_EXPORTS) || defined(plmeta_EXPORTS) || defined(ps_EXPORTS) || \
+ defined(pstex_EXPORTS) || defined(psttf_EXPORTS) || defined(svg_EXPORTS) || \
+ defined(tek_EXPORTS) || defined(tk_EXPORTS) || defined(tkwin_EXPORTS) || \
+ defined(wingcc_EXPORTS) || defined(wxwidgets_EXPORTS) || defined(xfig_EXPORTS) || \
+ defined(xwin_EXPORTS) || defined(qt_EXPORTS)
+ #define PLDLLIMPEXP_DRIVER PLDLLEXPORT
+ #define PLDLLIMPEXP_DRIVER_DATA(type) PLDLLEXPORT type
+ #else
+ #define PLDLLIMPEXP_DRIVER PLDLLIMPORT
+ #define PLDLLIMPEXP_DRIVER_DATA(type) PLDLLIMPORT type
+ #endif
+#else
+ #define PLDLLIMPEXP_DRIVER PLDLLIMPEXP
+ #define PLDLLIMPEXP_DRIVER_DATA(type) PLDLLIMPEXP_DATA(type)
+#endif
+
+#if defined(plplotcxx${LIB_TAG}_EXPORTS)
+ #define PLDLLIMPEXP_CXX PLDLLEXPORT
+ #define PLDLLIMPEXP_CXX_DATA(type) PLDLLEXPORT type
+#else
+ #define PLDLLIMPEXP_CXX PLDLLIMPORT
+ #define PLDLLIMPEXP_CXX_DATA(type) PLDLLIMPORT type
+#endif
+
+#if defined(plplotf77c${LIB_TAG}_EXPORTS)
+ #define PLDLLIMPEXP_F77C PLDLLEXPORT
+ #define PLDLLIMPEXP_F77C_DATA(type) PLDLLEXPORT type
+#else
+ #define PLDLLIMPEXP_F77C PLDLLIMPORT
+ #define PLDLLIMPEXP_F77C_DATA(type) PLDLLIMPORT type
+#endif
+
+#if defined(plplotf95c${LIB_TAG}_EXPORTS)
+ #define PLDLLIMPEXP_F95C PLDLLEXPORT
+ #define PLDLLIMPEXP_F95C_DATA(type) PLDLLEXPORT type
+#else
+ #define PLDLLIMPEXP_F95C PLDLLIMPORT
+ #define PLDLLIMPEXP_F95C_DATA(type) PLDLLIMPORT type
+#endif
+
+#if defined(plplotwxwidgets${LIB_TAG}_EXPORTS)
+ #define PLDLLIMPEXP_WX PLDLLEXPORT
+ #define PLDLLIMPEXP_WX_DATA(type) PLDLLEXPORT type
+#else
+ #define PLDLLIMPEXP_WX PLDLLIMPORT
+ #define PLDLLIMPEXP_WX_DATA(type) PLDLLIMPORT type
+#endif
+
+#if defined(tclmatrix${LIB_TAG}_EXPORTS)
+ #define PLDLLIMPEXP_TCLMAT PLDLLEXPORT
+ #define PLDLLIMPEXP_TCLMAT_DATA(type) PLDLLEXPORT type
+#else
+ #define PLDLLIMPEXP_TCLMAT PLDLLIMPORT
+ #define PLDLLIMPEXP_TCLMAT_DATA(type) PLDLLIMPORT type
+#endif
+
+#if defined(plplottcltk${LIB_TAG}_EXPORTS)
+ #define PLDLLIMPEXP_TCLTK PLDLLEXPORT
+ #define PLDLLIMPEXP_TCLTK_DATA(type) PLDLLEXPORT type
+#else
+ #define PLDLLIMPEXP_TCLTK PLDLLIMPORT
+ #define PLDLLIMPEXP_TCLTK_DATA(type) PLDLLIMPORT type
+#endif
+
+#if defined(plplotgnome2${LIB_TAG}_EXPORTS)
+ #define PLDLLIMPEXP_GNOME2 PLDLLEXPORT
+ #define PLDLLIMPEXP_GNOME2_DATA(type) PLDLLEXPORT type
+#else
+ #define PLDLLIMPEXP_GNOME2 PLDLLIMPORT
+ #define PLDLLIMPEXP_GNOME2_DATA(type) PLDLLIMPORT type
+#endif
+
+#if defined(cplplotcanvasmodule_EXPORTS)
+ #define PLDLLIMPEXP_CPLPLOTCANVASMODULE PLDLLEXPORT
+ #define PLDLLIMPEXP_CPLPLOTCANVASMODULE_DATA(type) PLDLLEXPORT type
+#else
+ #define PLDLLIMPEXP_CPLPLOTCANVASMODULE PLDLLIMPORT
+ #define PLDLLIMPEXP_CPLPLOTCANVASMODULE_DATA(type) PLDLLIMPORT type
+#endif
+
+#if defined(plplot_widgetmodule_EXPORTS)
+ #define PLDLLIMPEXP_PLPLOT_WIDGETMODULE PLDLLEXPORT
+ #define PLDLLIMPEXP_PLPLOT_MODULE_DATA(type) PLDLLEXPORT type
+#else
+ #define PLDLLIMPEXP_PLPLOT_MODULE PLDLLIMPORT
+ #define PLDLLIMPEXP_PLPLOT_MODULE_DATA(type) PLDLLIMPORT type
+#endif
+
+#endif /* __PL_DLL_H */
Property changes on: trunk/include/pldll.h.in
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision
Added: svn:mergeinfo
+
Added: svn:eol-style
+ native
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2009-09-30 18:26:08
|
Revision: 10497
http://plplot.svn.sourceforge.net/plplot/?rev=10497&view=rev
Author: airwin
Date: 2009-09-30 18:26:00 +0000 (Wed, 30 Sep 2009)
Log Message:
-----------
Configure moc_files.h rather than writing it. This eliminates unnecessary
rebuilds of all qt-related software each time any CMakeLists.txt file is
touched.
Improve comments on what qt4_wrap_cpp actually does (which is to create
a custom command whose OUTPUT should be depended on by a custom target in
order to be executed at make time).
Modified Paths:
--------------
trunk/include/CMakeLists.txt
Added Paths:
-----------
trunk/include/moc_files.h.in
Modified: trunk/include/CMakeLists.txt
===================================================================
--- trunk/include/CMakeLists.txt 2009-09-30 17:11:53 UTC (rev 10496)
+++ trunk/include/CMakeLists.txt 2009-09-30 18:26:00 UTC (rev 10497)
@@ -120,18 +120,27 @@
list(APPEND MOC_OPTIONS -DPLD_extqt)
endif(PLD_extqt)
if(MOC_OPTIONS)
+ # This creates a custom command with OUTPUT ${QT_MOC_OUTFILES}.
qt4_wrap_cpp(
QT_MOC_OUTFILES
${CMAKE_SOURCE_DIR}/include/qt.h
OPTIONS ${MOC_OPTIONS}
)
- # Use custom target to force correct dependencies in various directories.
- # This target is used in three possible places (qt_gui, drivers, or src)
- # depending on build options.
+ # Use custom target to force correct target dependencies in
+ # various directories. This target is used in three possible
+ # places (qt_gui, drivers, or src) depending on build options.
+ # The CMake dependency parser creates the necessary file
+ # dependency on qt.h for all qt-related source code so there is no
+ # need to add the ${QT_MOC_OUTFILES} file dependencies for any
+ # target dependency on moc_outfiles_generated.
add_custom_target(moc_outfile_generated DEPENDS ${QT_MOC_OUTFILES})
- file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/moc_files.h "/* Generated header file listing the moc generated files to include in plqt.cpp. */ \n#ifndef __MOC_FILES_H__\n#define __MOC_FILES_H__\n\n")
- file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/moc_files.h "#include \"${QT_MOC_OUTFILES}\"\n")
- file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/moc_files.h "#endif /* __MOC_FILES_H__i */ \n")
+
+ # #include ${QT_MOC_OUTFILES}) indirectly via the configured moc_files.h
+ # header.
+ configure_file(
+ ${CMAKE_CURRENT_SOURCE_DIR}/moc_files.h.in
+ ${CMAKE_CURRENT_BINARY_DIR}/moc_files.h
+ )
else(MOC_OPTIONS)
message(FATAL_ERROR "Internal build system inconsistency between ANY_QT_DEVICE true and MOC_OPTIONS false.")
endif(MOC_OPTIONS)
Added: trunk/include/moc_files.h.in
===================================================================
--- trunk/include/moc_files.h.in (rev 0)
+++ trunk/include/moc_files.h.in 2009-09-30 18:26:00 UTC (rev 10497)
@@ -0,0 +1,6 @@
+/* Configured header file listing the moc-generated files to include in plqt.cpp. */
+#ifndef __MOC_FILES_H__
+#define __MOC_FILES_H__
+
+#include "@QT_MOC_OUTFILES@"
+#endif /* __MOC_FILES_H__i */
Property changes on: trunk/include/moc_files.h.in
___________________________________________________________________
Added: svn:eol-style
+ native
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2009-10-26 17:05:19
|
Revision: 10553
http://plplot.svn.sourceforge.net/plplot/?rev=10553&view=rev
Author: airwin
Date: 2009-10-26 17:05:13 +0000 (Mon, 26 Oct 2009)
Log Message:
-----------
Continue uncrustify runs until style converges (or in the case of
plplotP.h flips back and forth between two minor style variants).
Modified Paths:
--------------
trunk/include/plplotP.h
trunk/include/qt.h
Modified: trunk/include/plplotP.h
===================================================================
--- trunk/include/plplotP.h 2009-10-26 13:55:52 UTC (rev 10552)
+++ trunk/include/plplotP.h 2009-10-26 17:05:13 UTC (rev 10553)
@@ -646,8 +646,8 @@
typedef struct cont_level
{
- PLFLT level;
- struct cont_line *line; /* contour line */
+ PLFLT level;
+ struct cont_line *line; /* contour line */
struct cont_level *next; /* contour level */
} CONT_LEVEL;
Modified: trunk/include/qt.h
===================================================================
--- trunk/include/qt.h 2009-10-26 13:55:52 UTC (rev 10552)
+++ trunk/include/qt.h 2009-10-26 17:05:13 UTC (rev 10553)
@@ -316,7 +316,7 @@
void resetPensAndBrushes( QPainter* );
- double m_dAspectRatio; // Is kept constant during resizes
+ double m_dAspectRatio; // Is kept constant during resizes
QPixmap * m_pixPixmap; // stores the drawn image as long as it does not have to be regenerated
QLinkedList<BufferElement> m_listBuffer; // Buffer holding the draw instructions
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2014-03-15 00:29:03
|
Revision: 13058
http://sourceforge.net/p/plplot/code/13058
Author: andrewross
Date: 2014-03-15 00:28:58 +0000 (Sat, 15 Mar 2014)
Log Message:
-----------
Update qt5 support so moc is properly called on qt.h.
Modified Paths:
--------------
trunk/include/CMakeLists.txt
trunk/include/moc_files.h.in
Modified: trunk/include/CMakeLists.txt
===================================================================
--- trunk/include/CMakeLists.txt 2014-03-14 23:17:42 UTC (rev 13057)
+++ trunk/include/CMakeLists.txt 2014-03-15 00:28:58 UTC (rev 13058)
@@ -120,23 +120,28 @@
list(APPEND MOC_OPTIONS -DPLD_extqt)
endif(PLD_extqt)
if(MOC_OPTIONS)
- # Use entirely different method for Qt5.
- if(NOT PLPLOT_USE_QT5)
- # This creates a custom command with OUTPUT ${QT_MOC_OUTFILES}.
+ # This creates a custom command with OUTPUT ${QT_MOC_OUTFILES}.
+ if(PLPLOT_USE_QT5)
+ qt5_wrap_cpp(
+ QT_MOC_OUTFILES
+ ${CMAKE_SOURCE_DIR}/include/qt.h
+ OPTIONS ${MOC_OPTIONS}
+ )
+ else(PLPLOT_USE_QT5)
qt4_wrap_cpp(
QT_MOC_OUTFILES
${CMAKE_SOURCE_DIR}/include/qt.h
OPTIONS ${MOC_OPTIONS}
)
- # Use custom target to force correct target dependencies in
- # various directories. This target is used in three possible
- # places (qt_gui, drivers, or src) depending on build options.
- # The CMake dependency parser creates the necessary file
- # dependency on qt.h for all qt-related source code so there is no
- # need to add the ${QT_MOC_OUTFILES} file dependencies for any
- # target dependency on moc_outfiles_generated.
- add_custom_target(moc_outfile_generated DEPENDS ${QT_MOC_OUTFILES})
- endif(NOT PLPLOT_USE_QT5)
+ endif(PLPLOT_USE_QT5)
+ # Use custom target to force correct target dependencies in
+ # various directories. This target is used in three possible
+ # places (qt_gui, drivers, or src) depending on build options.
+ # The CMake dependency parser creates the necessary file
+ # dependency on qt.h for all qt-related source code so there is no
+ # need to add the ${QT_MOC_OUTFILES} file dependencies for any
+ # target dependency on moc_outfiles_generated.
+ add_custom_target(moc_outfile_generated DEPENDS ${QT_MOC_OUTFILES})
# #include ${QT_MOC_OUTFILES}) indirectly via the configured moc_files.h
# header.
Modified: trunk/include/moc_files.h.in
===================================================================
--- trunk/include/moc_files.h.in 2014-03-14 23:17:42 UTC (rev 13057)
+++ trunk/include/moc_files.h.in 2014-03-15 00:28:58 UTC (rev 13058)
@@ -1,7 +1,5 @@
// Configured header file listing the moc-generated files to include in plqt.cpp.
#ifndef __MOC_FILES_H__
#define __MOC_FILES_H__
-#ifndef PLPLOT_USE_QT5
#include "@QT_MOC_OUTFILES@"
-#endif
#endif // __MOC_FILES_H__
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2010-10-22 00:25:44
|
Revision: 11269
http://plplot.svn.sourceforge.net/plplot/?rev=11269&view=rev
Author: airwin
Date: 2010-10-22 00:25:36 +0000 (Fri, 22 Oct 2010)
Log Message:
-----------
Convert from /* ... */ commentary style to // style for all C (as
opposed to C++) headers. The results pass a number of tests that are
mentioned on list.
ToDo: So far we have only converted C code in src and include to the
new commentary style. Those are obviously really important cases, but
we still have lots more C and C++ code (e.g., in lib, bindings,
drivers, and examples) that needs to be changed to the new commentary
style.
Modified Paths:
--------------
trunk/include/dirent_msvc.h
trunk/include/disptab.h
trunk/include/drivers.h
trunk/include/gcw.h
trunk/include/ltdl_win32.h
trunk/include/metadefs.h
trunk/include/moc_files.h.in
trunk/include/pdf.h
trunk/include/plConfig.h.cmake
trunk/include/plDevs.h.cmake
trunk/include/plcore.h
trunk/include/pldebug.h
trunk/include/pldll.h.in
trunk/include/plevent.h
trunk/include/plfci-truetype.h
trunk/include/plfci-type1.h
trunk/include/plfreetype.h
trunk/include/plplot.h
trunk/include/plplotP.h
trunk/include/plplotcanvas-hacktext.h
trunk/include/plplotcanvas.h
trunk/include/plstrm.h
trunk/include/plunicode-type1.h
trunk/include/plxwd.h
trunk/include/ps.h
Modified: trunk/include/dirent_msvc.h
===================================================================
--- trunk/include/dirent_msvc.h 2010-10-22 00:17:31 UTC (rev 11268)
+++ trunk/include/dirent_msvc.h 2010-10-22 00:25:36 UTC (rev 11269)
@@ -1,58 +1,58 @@
-/*
- * dirent.h - dirent API for Microsoft Visual Studio
- *
- * Copyright (C) 2006 Toni Ronkko
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * ``Software''), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED ``AS IS'', WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL TONI RONKKO BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- *
- *
- * Jan 18, 2008, Toni Ronkko
- * Using FindFirstFileA and WIN32_FIND_DATAA to avoid converting string
- * between multi-byte and unicode representations. This makes the
- * code simpler and also allows the code to be compiled under MingW. Thanks
- * to Azriel Fasten for the suggestion.
- *
- * Mar 4, 2007, Toni Ronkko
- * Bug fix: due to the strncpy_s() function this file only compiled in
- * Visual Studio 2005. Using the new string functions only when the
- * compiler version allows.
- *
- * Nov 2, 2006, Toni Ronkko
- * Major update: removed support for Watcom C, MS-DOS and Turbo C to
- * simplify the file, updated the code to compile cleanly on Visual
- * Studio 2005 with both unicode and multi-byte character strings,
- * removed rewinddir() as it had a bug.
- *
- * Aug 20, 2006, Toni Ronkko
- * Removed all remarks about MSVC 1.0, which is antiqued now. Simplified
- * comments by removing SGML tags.
- *
- * May 14 2002, Toni Ronkko
- * Embedded the function definitions directly to the header so that no
- * source modules need to be included in the Visual Studio project. Removed
- * all the dependencies to other projects so that this very header can be
- * used independently.
- *
- * May 28 1998, Toni Ronkko
- * First version.
- */
+//
+// dirent.h - dirent API for Microsoft Visual Studio
+//
+// Copyright (C) 2006 Toni Ronkko
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// ``Software''), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be included
+// in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED ``AS IS'', WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+// IN NO EVENT SHALL TONI RONKKO BE LIABLE FOR ANY CLAIM, DAMAGES OR
+// OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+// OTHER DEALINGS IN THE SOFTWARE.
+//
+//
+// Jan 18, 2008, Toni Ronkko
+// Using FindFirstFileA and WIN32_FIND_DATAA to avoid converting string
+// between multi-byte and unicode representations. This makes the
+// code simpler and also allows the code to be compiled under MingW. Thanks
+// to Azriel Fasten for the suggestion.
+//
+// Mar 4, 2007, Toni Ronkko
+// Bug fix: due to the strncpy_s() function this file only compiled in
+// Visual Studio 2005. Using the new string functions only when the
+// compiler version allows.
+//
+// Nov 2, 2006, Toni Ronkko
+// Major update: removed support for Watcom C, MS-DOS and Turbo C to
+// simplify the file, updated the code to compile cleanly on Visual
+// Studio 2005 with both unicode and multi-byte character strings,
+// removed rewinddir() as it had a bug.
+//
+// Aug 20, 2006, Toni Ronkko
+// Removed all remarks about MSVC 1.0, which is antiqued now. Simplified
+// comments by removing SGML tags.
+//
+// May 14 2002, Toni Ronkko
+// Embedded the function definitions directly to the header so that no
+// source modules need to be included in the Visual Studio project. Removed
+// all the dependencies to other projects so that this very header can be
+// used independently.
+//
+// May 28 1998, Toni Ronkko
+// First version.
+//
#ifndef DIRENT_H
#define DIRENT_H
@@ -63,26 +63,26 @@
typedef struct dirent
{
- /* name of current directory entry (a multi-byte character string) */
+ // name of current directory entry (a multi-byte character string)
char d_name[MAX_PATH + 1];
- /* file attributes */
+ // file attributes
WIN32_FIND_DATAA data;
} dirent;
typedef struct DIR
{
- /* current directory entry */
+ // current directory entry
dirent current;
- /* is there an un-processed entry in current? */
+ // is there an un-processed entry in current?
int cached;
- /* file search handle */
+ // file search handle
HANDLE search_handle;
- /* search pattern (3 = zero terminator + pattern "\\*") */
+ // search pattern (3 = zero terminator + pattern "\\*")
char patt[MAX_PATH + 3];
} DIR;
@@ -92,7 +92,7 @@
static int closedir( DIR *dirp );
-/* use the new safe string functions introduced in Visual Studio 2005 */
+// use the new safe string functions introduced in Visual Studio 2005
#if defined ( _MSC_VER ) && _MSC_VER >= 1400
# define STRNCPY( dest, src, size ) strncpy_s( ( dest ), ( size ), ( src ), _TRUNCATE )
#else
@@ -100,11 +100,11 @@
#endif
-/*
- * Open directory stream DIRNAME for read and return a pointer to the
- * internal working area that is used to retrieve individual directory
- * entries.
- */
+//
+// Open directory stream DIRNAME for read and return a pointer to the
+// internal working area that is used to retrieve individual directory
+// entries.
+//
static DIR*
opendir(
const char *dirname )
@@ -113,17 +113,17 @@
assert( dirname != NULL );
assert( strlen( dirname ) < MAX_PATH );
- /* construct new DIR structure */
+ // construct new DIR structure
dirp = (DIR*) malloc( sizeof ( struct DIR ) );
if ( dirp != NULL )
{
char *p;
- /* take directory name... */
+ // take directory name...
STRNCPY( dirp->patt, dirname, sizeof ( dirp->patt ) );
dirp->patt[MAX_PATH] = '\0';
- /* ... and append search pattern to it */
+ // ... and append search pattern to it
p = strchr( dirp->patt, '\0' );
if ( dirp->patt < p && *( p - 1 ) != '\\' && *( p - 1 ) != ':' )
{
@@ -132,29 +132,29 @@
*p++ = '*';
*p = '\0';
- /* open stream and retrieve first file */
+ // open stream and retrieve first file
dirp->search_handle = FindFirstFileA( dirp->patt, &dirp->current.data );
if ( dirp->search_handle == INVALID_HANDLE_VALUE )
{
- /* invalid search pattern? */
+ // invalid search pattern?
free( dirp );
return NULL;
}
- /* there is an un-processed directory entry in memory now */
+ // there is an un-processed directory entry in memory now
dirp->cached = 1;
}
return dirp;
}
-/*
- * Read a directory entry, and return a pointer to a dirent structure
- * containing the name of the entry in d_name field. Individual directory
- * entries returned by this very function include regular files,
- * sub-directories, pseudo-directories "." and "..", but also volume labels,
- * hidden files and system files may be returned.
- */
+//
+// Read a directory entry, and return a pointer to a dirent structure
+// containing the name of the entry in d_name field. Individual directory
+// entries returned by this very function include regular files,
+// sub-directories, pseudo-directories "." and "..", but also volume labels,
+// hidden files and system files may be returned.
+//
static struct dirent *
readdir(
DIR *dirp )
@@ -163,29 +163,29 @@
if ( dirp->search_handle == INVALID_HANDLE_VALUE )
{
- /* directory stream was opened/rewound incorrectly or it ended normally */
+ // directory stream was opened/rewound incorrectly or it ended normally
return NULL;
}
- /* get next directory entry */
+ // get next directory entry
if ( dirp->cached != 0 )
{
- /* a valid directory entry already in memory */
+ // a valid directory entry already in memory
dirp->cached = 0;
}
else
{
- /* read next directory entry from disk */
+ // read next directory entry from disk
if ( FindNextFileA( dirp->search_handle, &dirp->current.data ) == FALSE )
{
- /* the very last file has been processed or an error occured */
+ // the very last file has been processed or an error occured
FindClose( dirp->search_handle );
dirp->search_handle = INVALID_HANDLE_VALUE;
return NULL;
}
}
- /* copy as a multibyte character string */
+ // copy as a multibyte character string
STRNCPY( dirp->current.d_name, dirp->current.data.cFileName, sizeof ( dirp->current.d_name ) );
dirp->current.d_name[MAX_PATH] = '\0';
@@ -193,28 +193,28 @@
}
-/*
- * Close directory stream opened by opendir() function. Close of the
- * directory stream invalidates the DIR structure as well as any previously
- * read directory entry.
- */
+//
+// Close directory stream opened by opendir() function. Close of the
+// directory stream invalidates the DIR structure as well as any previously
+// read directory entry.
+//
static int
closedir(
DIR *dirp )
{
assert( dirp != NULL );
- /* release search handle */
+ // release search handle
if ( dirp->search_handle != INVALID_HANDLE_VALUE )
{
FindClose( dirp->search_handle );
dirp->search_handle = INVALID_HANDLE_VALUE;
}
- /* release directory handle */
+ // release directory handle
free( dirp );
return 0;
}
-#endif /*DIRENT_H*/
+#endif //DIRENT_H
Modified: trunk/include/disptab.h
===================================================================
--- trunk/include/disptab.h 2010-10-22 00:17:31 UTC (rev 11268)
+++ trunk/include/disptab.h 2010-10-22 00:25:36 UTC (rev 11269)
@@ -1,7 +1,7 @@
-/* $Id$
- *
- * Defines the data structure which holds the driver functions.
- */
+// $Id$
+//
+// Defines the data structure which holds the driver functions.
+//
#ifndef __DISPATCH_H__
#define __DISPATCH_H__
@@ -17,54 +17,54 @@
plDevType_Null = -1
};
-/*--------------------------------------------------------------------------*\
- * Define structure containing pointers to device dependent functions.
- *
- * pl_MenuStr Pointer to string that is printed in device menu.
- *
- * pl_DevName A short device "name" for device selection by name.
- *
- * pl_type 0 for file-oriented device, 1 for interactive
- * (the null driver uses -1 here)
- *
- * pl_seq The sequence number for ordering the presentation list of the
- * available drivers. This is an ordering only, not an absolute
- * position in the list.
- *
- * pl_init Initialize device. This routine may also prompt the user
- * for certain device parameters or open a graphics file
- * (see note). Called only once to set things up. Certain
- * options such as familying and resolution (dots/mm) should
- * be set up before calling this routine (note: some drivers
- * ignore these).
- *
- * pl_line Draws a line between two points.
- *
- * pl_polyline Draws a polyline (no broken segments).
- *
- * pl_eop Finishes out current page (see note).
- *
- * pl_bop Set up for plotting on a new page. May also open a new
- * a new graphics file (see note).
- *
- * pl_tidy Tidy up. May close graphics file (see note).
- *
- * pl_state Handle change in PLStream state
- * (color, pen width, fill attribute, etc).
- *
- * pl_esc Escape function for driver-specific commands.
- *
- *
- * Notes:
- *
- * Most devices allow multi-page plots to be stored in a single graphics
- * file, in which case the graphics file should be opened in the pl_init()
- * routine, closed in pl_tidy(), and page advances done by calling pl_eop
- * and pl_bop() in sequence. If multi-page plots need to be stored in
- * different files then pl_bop() should open the file and pl_eop() should
- * close it. Do NOT open files in both pl_init() and pl_bop() or close
- * files in both pl_eop() and pl_tidy().
- \*--------------------------------------------------------------------------*/
+//--------------------------------------------------------------------------
+// Define structure containing pointers to device dependent functions.
+//
+// pl_MenuStr Pointer to string that is printed in device menu.
+//
+// pl_DevName A short device "name" for device selection by name.
+//
+// pl_type 0 for file-oriented device, 1 for interactive
+// (the null driver uses -1 here)
+//
+// pl_seq The sequence number for ordering the presentation list of the
+// available drivers. This is an ordering only, not an absolute
+// position in the list.
+//
+// pl_init Initialize device. This routine may also prompt the user
+// for certain device parameters or open a graphics file
+// (see note). Called only once to set things up. Certain
+// options such as familying and resolution (dots/mm) should
+// be set up before calling this routine (note: some drivers
+// ignore these).
+//
+// pl_line Draws a line between two points.
+//
+// pl_polyline Draws a polyline (no broken segments).
+//
+// pl_eop Finishes out current page (see note).
+//
+// pl_bop Set up for plotting on a new page. May also open a new
+// a new graphics file (see note).
+//
+// pl_tidy Tidy up. May close graphics file (see note).
+//
+// pl_state Handle change in PLStream state
+// (color, pen width, fill attribute, etc).
+//
+// pl_esc Escape function for driver-specific commands.
+//
+//
+// Notes:
+//
+// Most devices allow multi-page plots to be stored in a single graphics
+// file, in which case the graphics file should be opened in the pl_init()
+// routine, closed in pl_tidy(), and page advances done by calling pl_eop
+// and pl_bop() in sequence. If multi-page plots need to be stored in
+// different files then pl_bop() should open the file and pl_eop() should
+// close it. Do NOT open files in both pl_init() and pl_bop() or close
+// files in both pl_eop() and pl_tidy().
+//--------------------------------------------------------------------------
typedef void ( *plD_init_fp )( struct PLStream_struct * );
typedef void ( *plD_line_fp )( struct PLStream_struct *, short, short, short, short );
@@ -91,4 +91,4 @@
plD_esc_fp pl_esc;
} PLDispatchTable;
-#endif /* __DISPATCH_H__ */
+#endif // __DISPATCH_H__
Modified: trunk/include/drivers.h
===================================================================
--- trunk/include/drivers.h 2010-10-22 00:17:31 UTC (rev 11268)
+++ trunk/include/drivers.h 2010-10-22 00:25:36 UTC (rev 11269)
@@ -1,28 +1,28 @@
-/* $Id$
- *
- * Contains all prototypes for driver functions.
- *
- * Copyright (C) 2004 Andrew Roach
- * Copyright (C) 2005 Thomas J. Duck
- * Copyright (C) 2006 Andrew Ross
- *
- * This file is part of PLplot.
- *
- * PLplot is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Library General Public License as published
- * by the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * PLplot is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public License
- * along with PLplot; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
- */
+// $Id$
+//
+// Contains all prototypes for driver functions.
+//
+// Copyright (C) 2004 Andrew Roach
+// Copyright (C) 2005 Thomas J. Duck
+// Copyright (C) 2006 Andrew Ross
+//
+// This file is part of PLplot.
+//
+// PLplot is free software; you can redistribute it and/or modify
+// it under the terms of the GNU Library General Public License as published
+// by the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version.
+//
+// PLplot is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU Library General Public License for more details.
+//
+// You should have received a copy of the GNU Library General Public License
+// along with PLplot; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+//
+//
#ifndef __DRIVERS_H__
#define __DRIVERS_H__
@@ -110,7 +110,7 @@
PLDLLIMPEXP_DRIVER void plD_dispatch_init_extqt( PLDispatchTable *pdt );
PLDLLIMPEXP_DRIVER void plD_dispatch_init_memqt( PLDispatchTable *pdt );
-/* Prototypes for plot buffer calls. */
+// Prototypes for plot buffer calls.
void plbuf_init( PLStream * );
void plbuf_line( PLStream *, short, short, short, short );
@@ -130,4 +130,4 @@
}
#endif
-#endif /* __DRIVERS_H__ */
+#endif // __DRIVERS_H__
Modified: trunk/include/gcw.h
===================================================================
--- trunk/include/gcw.h 2010-10-22 00:17:31 UTC (rev 11268)
+++ trunk/include/gcw.h 2010-10-22 00:25:36 UTC (rev 11269)
@@ -1,26 +1,26 @@
-/* gcw - PLplot Gnome Canvas Widget device driver.
- *
- * Copyright (C) 2004, 2005 Thomas J. Duck
- * Copyright (C) 2004 Rafael Laboissiere
- * All rights reserved.
- *
- * NOTICE
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
- * USA
- */
+// gcw - PLplot Gnome Canvas Widget device driver.
+//
+// Copyright (C) 2004, 2005 Thomas J. Duck
+// Copyright (C) 2004 Rafael Laboissiere
+// All rights reserved.
+//
+// NOTICE
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+// USA
+//
#ifndef __GCW_H__
#define __GCW_H__
@@ -40,98 +40,98 @@
#include <libgnomeprint/gnome-print.h>
-/* #define DEBUG_GCW_1 */
-/* #define DEBUG_GCW_2 */
-/* #define ASSERT_GCW */
+// #define DEBUG_GCW_1
+// #define DEBUG_GCW_2
+// #define ASSERT_GCW
-/*=========================================================================*/
-/* GcwPLdev - the PLplot device structure for the GCW driver */
+//=========================================================================
+// GcwPLdev - the PLplot device structure for the GCW driver
typedef struct
{
- GnomeCanvas * canvas; /* The canvas to draw on */
- GdkPixmap * background; /* The background */
- GdkGC * gc; /* A graphics context for the pixmap */
+ GnomeCanvas * canvas; // The canvas to draw on
+ GdkPixmap * background; // The background
+ GdkGC * gc; // A graphics context for the pixmap
- GnomeCanvasGroup* group_visible; /* Visible group, removed at next eop */
- GnomeCanvasGroup* group_hidden; /* Hidden group --> visible at eop */
- GnomeCanvasGroup* group_persistent; /* Persistent group, at from and never erased */
+ GnomeCanvasGroup* group_visible; // Visible group, removed at next eop
+ GnomeCanvasGroup* group_hidden; // Hidden group --> visible at eop
+ GnomeCanvasGroup* group_persistent; // Persistent group, at from and never erased
- gboolean use_persistence; /* Flags the persistent group should be used,
- * and that it and the background should not be
- * erased when the page is advanced.
- */
+ gboolean use_persistence; // Flags the persistent group should be used,
+ // and that it and the background should not be
+ // erased when the page is advanced.
+ //
- GtkWidget * window; /* A window used in standalone mode */
- GtkWidget * notebook; /* A notebook pager in the window */
- GtkWidget * statusbar; /* A statusbar for the window */
- GtkWidget * filew; /* A file widget chooser when Save is pressed */
+ GtkWidget * window; // A window used in standalone mode
+ GtkWidget * notebook; // A notebook pager in the window
+ GtkWidget * statusbar; // A statusbar for the window
+ GtkWidget * filew; // A file widget chooser when Save is pressed
- guint32 color; /* Current pen color */
- GdkColor bgcolor; /* Background color (shouldn't change) */
- GdkColormap* colormap; /* The gdk colormap for the canvas */
+ guint32 color; // Current pen color
+ GdkColor bgcolor; // Background color (shouldn't change)
+ GdkColormap* colormap; // The gdk colormap for the canvas
- PLINT width; /* Width of the canvas in device pixels */
- PLINT height; /* Height of the canvas in device pixels */
+ PLINT width; // Width of the canvas in device pixels
+ PLINT height; // Height of the canvas in device pixels
- PLINT pen_color; /* Current pen color */
- PLINT pen_width; /* Current pen width */
+ PLINT pen_color; // Current pen color
+ PLINT pen_width; // Current pen width
- gboolean use_pixmap; /* Flags pixmap use for lines and fills */
- gboolean pixmap_has_data; /* Flags that the pixmap has data */
+ gboolean use_pixmap; // Flags pixmap use for lines and fills
+ gboolean pixmap_has_data; // Flags that the pixmap has data
- gboolean plstate_width; /* Flags indicating change of state before */
- gboolean plstate_color0; /* device is fully initialized */
+ gboolean plstate_width; // Flags indicating change of state before
+ gboolean plstate_color0; // device is fully initialized
gboolean plstate_color1;
- gboolean allow_resize; /* Flags whether device resizing is allowed */
+ gboolean allow_resize; // Flags whether device resizing is allowed
} GcwPLdev;
-/*=========================================================================*/
-/* Physical dimension constants used by the driver */
+//=========================================================================
+// Physical dimension constants used by the driver
-/* Virtual coordinate scaling parameter, used to do calculations at
- * higher resolution. Chosen to be 32 for consistency with the PLplot
- * metafile (see plplotP.h).
- *
- * The trick here is to do everything in device coordinates on the driver
- * side, but report/receive everything in virtual coordinates to/from the
- * PLplot core.
- */
+// Virtual coordinate scaling parameter, used to do calculations at
+// higher resolution. Chosen to be 32 for consistency with the PLplot
+// metafile (see plplotP.h).
+//
+// The trick here is to do everything in device coordinates on the driver
+// side, but report/receive everything in virtual coordinates to/from the
+// PLplot core.
+//
#define VSCALE ( 32. )
-/* pixels per mm */
+// pixels per mm
#define DEVICE_PIXELS_PER_MM ( 3.4 )
#define VIRTUAL_PIXELS_PER_MM ( DEVICE_PIXELS_PER_MM * VSCALE )
-/* mm per inch */
+// mm per inch
#define MM_PER_IN ( 25.4 )
-/* pixels per inch */
+// pixels per inch
#define DEVICE_PIXELS_PER_IN ( DEVICE_PIXELS_PER_MM * MM_PER_IN )
#define VIRTUAL_PIXELS_PER_IN ( VIRTUAL_PIXELS_PER_MM * MM_PER_IN )
-/* Default dimensions of the canvas (in inches) */
+// Default dimensions of the canvas (in inches)
#define CANVAS_WIDTH ( 10. )
#define CANVAS_HEIGHT ( 7.5 )
-/* The zoom factor for 100% zoom in */
+// The zoom factor for 100% zoom in
#define ZOOM100 ( 1.0 )
#define ZOOMSTEP ( 1.25 )
-/*=========================================================================*/
-/* GCW "Gnome Canvas Widget" Library prototypes (see gcw-lib.c) */
+//=========================================================================
+// GCW "Gnome Canvas Widget" Library prototypes (see gcw-lib.c)
-/* Public_functions */
+// Public_functions
void gcw_use_text( PLINT use_text );
void gcw_use_pixmap( PLINT use_pixmap );
void gcw_use_hrshsym( PLINT use_hrshsym );
-/* Private functions */
+// Private functions
void gcw_debug( char* msg );
PLDLLIMPEXP_GNOME2 void gcw_set_gdk_color();
@@ -143,4 +143,4 @@
void gcw_set_canvas_zoom( GnomeCanvas* canvas, PLFLT magnification );
void gcw_use_persistence( PLINT use_persistence );
-#endif /* __GCW_H__ */
+#endif // __GCW_H__
Modified: trunk/include/ltdl_win32.h
===================================================================
--- trunk/include/ltdl_win32.h 2010-10-22 00:17:31 UTC (rev 11268)
+++ trunk/include/ltdl_win32.h 2010-10-22 00:25:36 UTC (rev 11269)
@@ -1,26 +1,26 @@
-/* $Id$
- *
- * Contains all prototypes for driver functions.
- *
- * Copyright (C) 2008 Werner Smekal
- *
- * This file is part of PLplot.
- *
- * PLplot is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Library General Public License as published
- * by the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * PLplot is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public License
- * along with PLplot; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
- */
+// $Id$
+//
+// Contains all prototypes for driver functions.
+//
+// Copyright (C) 2008 Werner Smekal
+//
+// This file is part of PLplot.
+//
+// PLplot is free software; you can redistribute it and/or modify
+// it under the terms of the GNU Library General Public License as published
+// by the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version.
+//
+// PLplot is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU Library General Public License for more details.
+//
+// You should have received a copy of the GNU Library General Public License
+// along with PLplot; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+//
+//
#ifndef __LTDL_WIN32_H__
#define __LTDL_WIN32_H__
@@ -46,4 +46,4 @@
PLDLLIMPEXP void* lt_dlsym( lt_dlhandle dlhandle, const char* symbol );
-#endif /* __LTDL_WIN32_H__ */
+#endif // __LTDL_WIN32_H__
Modified: trunk/include/metadefs.h
===================================================================
--- trunk/include/metadefs.h 2010-10-22 00:17:31 UTC (rev 11268)
+++ trunk/include/metadefs.h 2010-10-22 00:25:36 UTC (rev 11269)
@@ -1,41 +1,41 @@
-/* $Id$
- *
- * Geoffrey Furnish
- * 5 May 1991
- *
- * This file contains definitions of constants and structures which
- * are needed by the PLplot metafile writer and renderer.
- */
+// $Id$
+//
+// Geoffrey Furnish
+// 5 May 1991
+//
+// This file contains definitions of constants and structures which
+// are needed by the PLplot metafile writer and renderer.
+//
-/*
- * PLMETA_HEADER holds the magic string at head of metafile.
- * PLMETA_VERSION holds the version number (year & letter).
- *
- * Note: All strings written into the file header are limited to a maximum
- * of 80 characters.
- */
+//
+// PLMETA_HEADER holds the magic string at head of metafile.
+// PLMETA_VERSION holds the version number (year & letter).
+//
+// Note: All strings written into the file header are limited to a maximum
+// of 80 characters.
+//
#define PLMETA_HEADER "PLPLOT"
#define PLMETA_VERSION "2005a"
-/* These are used by the TK driver client/server code */
+// These are used by the TK driver client/server code
#define PLSERV_HEADER "PLPLOT"
#define PLSERV_VERSION "2005b"
-/* Symbolic constants for old metafile versions (prior to 1992a). */
-/* Now these are stored in the metafile header. */
+// Symbolic constants for old metafile versions (prior to 1992a).
+// Now these are stored in the metafile header.
#define PLMETA_X_OLD 10000
#define PLMETA_Y_OLD 10000
-/* Virtual dots/mm for our virtual display space. */
+// Virtual dots/mm for our virtual display space.
#define PIXEL_RES_X_OLD 42
#define PIXEL_RES_Y_OLD 56
-/* Macros to make it easier to abort on nonzero return code */
-/* Can't call plexit on a write failure since that would be circular */
+// Macros to make it easier to abort on nonzero return code
+// Can't call plexit on a write failure since that would be circular
#define plm_wr( code ) \
if ( code ) { fprintf( stderr, "Unable to write to MetaFile\n" ); exit( 1 ); }
@@ -43,30 +43,30 @@
#define plm_rd( code ) \
if ( code ) plexit( "Unable to read from MetaFile" )
-/*
- * Metafile commands.
- *
- *** NOTICE !!! ***
- * If you change ANY of the following, you will wreck backward
- * backward compatibility with old metafiles. You may add, but do
- * NOT delete !!!
- */
+//
+// Metafile commands.
+//
+//** NOTICE !!! ***
+// If you change ANY of the following, you will wreck backward
+// backward compatibility with old metafiles. You may add, but do
+// NOT delete !!!
+//
#define INITIALIZE 1
#define CLOSE 2
-#define SWITCH_TO_TEXT 3 /* Obsolete, replaced by ESCAPE */
-#define SWITCH_TO_GRAPH 4 /* Obsolete, replaced by ESCAPE */
+#define SWITCH_TO_TEXT 3 // Obsolete, replaced by ESCAPE
+#define SWITCH_TO_GRAPH 4 // Obsolete, replaced by ESCAPE
#define EOP 5
#define BOP 6
-#define NEW_COLOR 7 /* Obsolete, replaced by CHANGE_STATE */
-#define NEW_WIDTH 8 /* Obsolete, replaced by CHANGE_STATE */
+#define NEW_COLOR 7 // Obsolete, replaced by CHANGE_STATE
+#define NEW_WIDTH 8 // Obsolete, replaced by CHANGE_STATE
#define LINE 9
#define LINETO 10
#define ESCAPE 11
-#define ADVANCE 12 /* Obsolete, BOP/EOP used instead */
+#define ADVANCE 12 // Obsolete, BOP/EOP used instead
#define POLYLINE 13
#define NEW_COLOR0 NEW_COLOR
#define NEW_COLOR1 14
#define CHANGE_STATE 15
-#define BOP0 16 /* First BOP in a file */
+#define BOP0 16 // First BOP in a file
#define END_OF_FIELD 255
Modified: trunk/include/moc_files.h.in
===================================================================
--- trunk/include/moc_files.h.in 2010-10-22 00:17:31 UTC (rev 11268)
+++ trunk/include/moc_files.h.in 2010-10-22 00:25:36 UTC (rev 11269)
@@ -1,6 +1,6 @@
-/* Configured header file listing the moc-generated files to include in plqt.cpp. */
+// Configured header file listing the moc-generated files to include in plqt.cpp.
#ifndef __MOC_FILES_H__
#define __MOC_FILES_H__
#include "@QT_MOC_OUTFILES@"
-#endif /* __MOC_FILES_H__i */
+#endif // __MOC_FILES_H__i
Modified: trunk/include/pdf.h
===================================================================
--- trunk/include/pdf.h 2010-10-22 00:17:31 UTC (rev 11268)
+++ trunk/include/pdf.h 2010-10-22 00:25:36 UTC (rev 11269)
@@ -1,28 +1,28 @@
-/* $Id$
- *
- * Copyright (C) 1992 by Maurice J. LeBrun
- *
- * Macros and prototypes for the PDF package.
- *
- * This software may be freely copied, modified and redistributed without
- * fee provided that this copyright notice is preserved intact on all
- * copies and modified copies.
- *
- * There is no warranty or other guarantee of fitness of this software.
- * It is provided solely "as is". The author(s) disclaim(s) all
- * responsibility and liability with respect to this software's usage or
- * its effect upon hardware or computer systems.
- */
+// $Id$
+//
+// Copyright (C) 1992 by Maurice J. LeBrun
+//
+// Macros and prototypes for the PDF package.
+//
+// This software may be freely copied, modified and redistributed without
+// fee provided that this copyright notice is preserved intact on all
+// copies and modified copies.
+//
+// There is no warranty or other guarantee of fitness of this software.
+// It is provided solely "as is". The author(s) disclaim(s) all
+// responsibility and liability with respect to this software's usage or
+// its effect upon hardware or computer systems.
+//
#ifndef __PDF_H__
#define __PDF_H__
-/*--------------------------------------------------------------------------*\
- * dll functions
- \*--------------------------------------------------------------------------*/
+//--------------------------------------------------------------------------
+// dll functions
+//--------------------------------------------------------------------------
#include "pldll.h"
-/* Some unsigned types */
+// Some unsigned types
#ifndef U_CHAR
#define U_CHAR unsigned char
@@ -44,45 +44,45 @@
#include <tcl.h>
#endif
-/* PDFstrm definition */
-/* The low level PDF i/o routines use the transfer method appropriate for */
-/* the first non-null type below */
+// PDFstrm definition
+// The low level PDF i/o routines use the transfer method appropriate for
+// the first non-null type below
typedef struct
{
- FILE *file; /* Filesystem */
- unsigned char *buffer; /* Memory buffer */
+ FILE *file; // Filesystem
+ unsigned char *buffer; // Memory buffer
#ifdef PLPLOT_USE_TCL_CHANNELS
- Tcl_Channel tclChan; /* Tcl channel */
+ Tcl_Channel tclChan; // Tcl channel
#endif
- long bp, bufmax; /* Buffer pointer and max size */
+ long bp, bufmax; // Buffer pointer and max size
} PDFstrm;
-/* Info for the i/o device. Only used by Tcl/TK/dp drivers for now */
+// Info for the i/o device. Only used by Tcl/TK/dp drivers for now
typedef struct
{
- int fd; /* I/O device file descriptor */
- FILE *file; /* File handle */
- const char *fileName; /* Fifo or socket name (if needed) */
- const char *fileHandle; /* Handle for use from interpreter */
- int type; /* Communication channel type */
- const char *typeName; /* As above, but in string form */
+ int fd; // I/O device file descriptor
+ FILE *file; // File handle
+ const char *fileName; // Fifo or socket name (if needed)
+ const char *fileHandle; // Handle for use from interpreter
+ int type; // Communication channel type
+ const char *typeName; // As above, but in string form
} PLiodev;
-/* Error numbers */
+// Error numbers
-#define PDF_ERROR 1 /* Unknown error */
-#define PDF_FNOPEN 2 /* File not open */
-#define PDF_FAOPEN 3 /* File already open */
-#define PDF_BADUN 4 /* Bad unit number */
-#define PDF_BADNBITS 5 /* Invalid # of bits */
-#define PDF_RDERR 6 /* Read error */
-#define PDF_WRERR 7 /* Write error */
-#define PDF_NOTPDF 8 /* Not a valid PDF file */
+#define PDF_ERROR 1 // Unknown error
+#define PDF_FNOPEN 2 // File not open
+#define PDF_FAOPEN 3 // File already open
+#define PDF_BADUN 4 // Bad unit number
+#define PDF_BADNBITS 5 // Invalid # of bits
+#define PDF_RDERR 6 // Read error
+#define PDF_WRERR 7 // Write error
+#define PDF_NOTPDF 8 // Not a valid PDF file
-/* Prototypes */
-/* Use a wrapper for the prototypes for use from K&R C */
+// Prototypes
+// Use a wrapper for the prototypes for use from K&R C
void pdf_set PLARGS( ( char *option, int value ) );
PLDLLIMPEXP PDFstrm *pdf_fopen PLARGS( ( const char *fileName, const char *mode ) );
@@ -111,4 +111,4 @@
PLDLLIMPEXP int pdf_wr_ieeef PLARGS( ( PDFstrm * pdfs, float f ) );
PLDLLIMPEXP int pdf_rd_ieeef PLARGS( ( PDFstrm * pdfs, float *pf ) );
-#endif /* __PDF_H__ */
+#endif // __PDF_H__
Modified: trunk/include/plConfig.h.cmake
===================================================================
--- trunk/include/plConfig.h.cmake 2010-10-22 00:17:31 UTC (rev 11268)
+++ trunk/include/plConfig.h.cmake 2010-10-22 00:25:36 UTC (rev 11269)
@@ -1,50 +1,50 @@
-/* -*-C-*- */
-/* $Id$
- *
- * Maurice LeBrun
- * IFS, University of Texas at Austin
- * 18-Jul-1994
- *
- * Copyright (C) 2004, 2006, 2007, 2008, 2009 Alan W. Irwin
- * Copyright (C) 2004 Rafael Laboissiere
- * Copyright (C) 2004 Joao Cardoso
- *
- * This file is part of PLplot.
- *
- * PLplot is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Library Public License as published
- * by the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * PLplot is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public License
- * along with PLplot; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
- */
+// -*-C-*-
+// $Id$
+//
+// Maurice LeBrun
+// IFS, University of Texas at Austin
+// 18-Jul-1994
+//
+// Copyright (C) 2004, 2006, 2007, 2008, 2009 Alan W. Irwin
+// Copyright (C) 2004 Rafael Laboissiere
+// Copyright (C) 2004 Joao Cardoso
+//
+// This file is part of PLplot.
+//
+// PLplot is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Library Public License as published
+// by the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version.
+//
+// PLplot is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU Library General Public License for more details.
+//
+// You should have received a copy of the GNU Library General Public License
+// along with PLplot; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+//
+//
-/* Configured (by CMake) macros for PLplot that are required for the
- * core build and the build of the installed
- * examples (and presumably any user applications). Therefore, the
- * configured plConfig.h should be installed. In contrast,
- * config.h.cmake (note, plConfig.h #includes config.h for
- * the core build because HAVE_CONFIG_H is #defined in that case)
- * contains configured macros that are only required for the core
- * build. Therefore, in contrast to plConfig.h, config.h should not
- * be installed.
- *
- * Maintenance issue: in makes no sense to configure duplicate macros
- * for both config.h and plConfig.h. Therefore, when adding a macro
- * decide which file to put it in depending on whether the result is
- * needed for the installed examples build or not. Furthermore, move
- * configured macros from one file to the other as needed depending on
- * that criterion, but do not copy them.
- *
- */
+// Configured (by CMake) macros for PLplot that are required for the
+// core build and the build of the installed
+// examples (and presumably any user applications). Therefore, the
+// configured plConfig.h should be installed. In contrast,
+// config.h.cmake (note, plConfig.h #includes config.h for
+// the core build because HAVE_CONFIG_H is #defined in that case)
+// contains configured macros that are only required for the core
+// build. Therefore, in contrast to plConfig.h, config.h should not
+// be installed.
+//
+// Maintenance issue: in makes no sense to configure duplicate macros
+// for both config.h and plConfig.h. Therefore, when adding a macro
+// decide which file to put it in depending on whether the result is
+// needed for the installed examples build or not. Furthermore, move
+// configured macros from one file to the other as needed depending on
+// that criterion, but do not copy them.
+//
+//
#ifndef __PLCONFIG_H__
#define __PLCONFIG_H__
@@ -53,48 +53,48 @@
# include <config.h>
#endif
-/* Define if you have c++ accessible stdint.h */
+// Define if you have c++ accessible stdint.h
#cmakedefine PL_HAVE_CXX_STDINT_H
-/* Define if snprintf is available */
+// Define if snprintf is available
#ifndef PL_HAVE_SNPRINTF
#cmakedefine PL_HAVE_SNPRINTF
#endif
-/* Define if _snprintf is available */
+// Define if _snprintf is available
#ifndef _PL_HAVE_SNPRINTF
#cmakedefine _PL_HAVE_SNPRINTF
#endif
-/* Define if isinf is available */
+// Define if isinf is available
#cmakedefine PL_HAVE_ISINF
-/* Define if _isinf is available */
+// Define if _isinf is available
#cmakedefine PL__HAVE_ISINF
-/* Define if isnan is available */
+// Define if isnan is available
#cmakedefine PL_HAVE_ISNAN
-/* Define if _isnan is available */
+// Define if _isnan is available
#cmakedefine PL__HAVE_ISNAN
-/* Define to 1 if you have the <stdint.h> header file. */
+// Define to 1 if you have the <stdint.h> header file.
#cmakedefine PL_HAVE_STDINT_H 1
-/* Define to 1 if you have the <unistd.h> header file. */
+// Define to 1 if you have the <unistd.h> header file.
#cmakedefine PL_HAVE_UNISTD_H 1
-/* Define if usleep is available */
+// Define if usleep is available
#cmakedefine PL_HAVE_USLEEP
-/* Define if you want PLplot's float type to be double */
+// Define if you want PLplot's float type to be double
#cmakedefine PL_DOUBLE
-/* Define if C++ compiler accepts using namespace */
+// Define if C++ compiler accepts using namespace
#cmakedefine PL_USE_NAMESPACE
-/* Define if isnan is present in <math.h> but not in <cmath>
- * - broken Mac OSX systems */
+// Define if isnan is present in <math.h> but not in <cmath>
+// - broken Mac OSX systems
#cmakedefine PL_BROKEN_ISNAN_CXX
-#endif /* __PLCONFIG_H__ */
+#endif // __PLCONFIG_H__
Modified: trunk/include/plDevs.h.cmake
===================================================================
--- trunk/include/plDevs.h.cmake 2010-10-22 00:17:31 UTC (rev 11268)
+++ trunk/include/plDevs.h.cmake 2010-10-22 00:25:36 UTC (rev 11269)
@@ -1,38 +1,38 @@
-/* -*-C-*- */
-/* $Id$
- *
- * Maurice LeBrun
- * IFS, University of Texas at Austin
- * 18-Jul-1994
- *
- * Contains macro definitions that determine what device drivers are
- * compiled into the PLplot library. On a Unix system, typically the
- * configure script builds plDevs.h from plDevs.h.in. Elsewhere, it's
- * best to hand-configure a plDevs.h file and keep it with the
- * system-specific files.
- *
- * Copyright (C) 2004 Andrew Roach
- * Copyright (C) 2005 Thomas J. Duck
- * Copyright (C) 2006 Andrew Ross
- * Copyright (C) 2006 Alan W. Irwin
- *
- * This file is part of PLplot.
- *
- * PLplot is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Library General Public License as published
- * by the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * PLplot is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public License
- * along with PLplot; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
- */
+// -*-C-*-
+// $Id$
+//
+// Maurice LeBrun
+// IFS, University of Texas at Austin
+// 18-Jul-1994
+//
+// Contains macro definitions that determine what device drivers are
+// compiled into the PLplot library. On a Unix system, typically the
+// configure script builds plDevs.h from plDevs.h.in. Elsewhere, it's
+// best to hand-configure a plDevs.h file and keep it with the
+// system-specific files.
+//
+// Copyright (C) 2004 Andrew Roach
+// Copyright (C) 2005 Thomas J. Duck
+// Copyright (C) 2006 Andrew Ross
+// Copyright (C) 2006 Alan W. Irwin
+//
+// This file is part of PLplot.
+//
+// PLplot is free software; you can redistribute it and/or modify
+// it under the terms of the GNU Library General Public License as published
+// by the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version.
+//
+// PLplot is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU Library General Public License for more details.
+//
+// You should have received a copy of the GNU Library General Public License
+// along with PLplot; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+//
+//
#ifndef __PLDEVS_H__
#define __PLDEVS_H__
@@ -98,4 +98,4 @@
#cmakedefine PLD_extqt
#cmakedefine PLD_memqt
-#endif /* __PLDEVS_H__ */
+#endif // __PLDEVS_H__
Modified: trunk/include/plcore.h
===================================================================
--- trunk/include/plcore.h 2010-10-22 00:17:31 UTC (rev 11268)
+++ trunk/include/plcore.h 2010-10-22 00:25:36 UTC (rev 11269)
@@ -1,28 +1,28 @@
-/* $Id$
- *
- * Contains declarations for core plplot data structures. This file
- * should be included only by plcore.c.
- *
- * Copyright (C) 2004 Andrew Roach
- * Copyright (C) 2005 Thomas J. Duck
- *
- * This file is part of PLplot.
- *
- * PLplot is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Library General Public License as published
- * by the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * PLplot is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public License
- * along with PLplot; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
- */
+// $Id$
+//
+// Contains declarations for core plplot data structures. This file
+// should be included only by plcore.c.
+//
+// Copyright (C) 2004 Andrew Roach
+// Copyright (C) 2005 Thomas J. Duck
+//
+// This file is part of PLplot.
+//
+// PLplot is free software; you can redistribute it and/or modify
+// it under the terms of the GNU Library General Public License as published
+// by the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version.
+//
+// PLplot is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU Library General Public License for more details.
+//
+// You should have received a copy of the GNU Library General Public License
+// along with PLplot; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+//
+//
#ifndef __PLCORE_H__
#define __PLCORE_H__
@@ -48,7 +48,7 @@
#endif
-/* Static function prototypes */
+// Static function prototypes
static char *utf8_to_ucs4( const char *ptr, PLUNICODE *unichar );
static void grline( short *, short *, PLINT );
@@ -67,48 +67,48 @@
static void plLoadDriver( void );
-/* Static variables */
+// Static variables
static PLINT xscl[PL_MAXPOLY], yscl[PL_MAXPOLY];
-static PLINT initfont = 1; /* initial font: extended by default */
+static PLINT initfont = 1; // initial font: extended by default
static PLINT lib_initialized = 0;
-/*--------------------------------------------------------------------------*\
- * Allocate a PLStream data structure (defined in plstrm.h).
- *
- * This struct contains a copy of every variable that is stream dependent.
- * Only the first [index=0] stream is statically allocated; the rest
- * are dynamically allocated when you switch streams (yes, it is legal
- * to only initialize the first element of the array of pointers).
- \*--------------------------------------------------------------------------*/
+//--------------------------------------------------------------------------
+// Allocate a PLStream data structure (defined in plstrm.h).
+//
+// This struct contains a copy of every variable that is stream dependent.
+// Only the first [index=0] stream is statically allocated; the rest
+// are dynamically allocated when you switch streams (yes, it is legal
+// to only initialize the first element of the array of pointers).
+//--------------------------------------------------------------------------
-static PLStream pls0; /* preallocated stream */
-static PLINT ipls; /* current stream number */
+static PLStream pls0; // preallocated stream
+static PLINT ipls; // current stream number
-static PLStream *pls[PL_NSTREAMS] = { &pls0 }; /* Array of stream pointers */
+static PLStream *pls[PL_NSTREAMS] = { &pls0 }; // Array of stream pointers
-/* Current stream pointer. Global, for easier access to state info */
+// Current stream pointer. Global, for easier access to state info
PLDLLIMPEXP_DATA( PLStream ) * plsc = &pls0;
-/* Only now can we include this */
+// Only now can we include this
#include "pldebug.h"
-/*--------------------------------------------------------------------------*\
- * Initialize dispatch table.
- *
- * Each device is selected by the appropriate define, passed in from the
- * makefile. When installing plplot you may wish to exclude devices not
- * present on your system in order to reduce screen clutter.
- *
- * If you hit a <CR> in response to the plinit() prompt, you get the FIRST
- * one active below, so arrange them accordingly for your system (i.e. all
- * the system-specific ones should go first, since they won't appear on
- * most systems.)
- \*--------------------------------------------------------------------------*/
+//--------------------------------------------------------------------------
+// Initialize dispatch table.
+//
+// Each device is selected by the appropriate define, passed in from the
+// makefile. When installing plplot you may wish to exclude devices not
+// present on your system in order to reduce screen clutter.
+//
+// If you hit a <CR> in response to the plinit() prompt, you get the FIRST
+// one active below, so arrange them accordingly for your system (i.e. all
+// the system-specific ones should go first, since they won't appear on
+// most systems.)
+//--------------------------------------------------------------------------
static PLDispatchTable **dispatch_table = 0;
static int npldrivers = 0;
@@ -145,7 +145,7 @@
#ifdef PLD_win3
plD_dispatch_init_win3,
#endif
-#if defined ( _MSC_VER ) && defined ( VGA ) /* graphics for msc */
+#if defined ( _MSC_VER ) && defined ( VGA ) // graphics for msc
plD_dispatch_init_vga,
#endif
#ifdef PLD_bgi
@@ -163,7 +163,7 @@
#if defined ( PLD_bmp ) && !defined ( ENABLE_DYNDRIVERS )
plD_dispatch_init_bmp,
#endif
-#ifdef PLD_emxvga /* graphics for emx+gcc */
+#ifdef PLD_emxvga // graphics for emx+gcc
plD_dispatch_init_vga,
#endif
#if defined ( PLD_xterm ) && !defined ( ENABLE_DYNDRIVERS )
@@ -340,9 +340,9 @@
sizeof ( PLDispatchInit ) ) - 1;
static int npldynamicdevices = 0;
-/*--------------------------------------------------------------------------*\
- * Stuff to support the loadable device drivers.
- \*--------------------------------------------------------------------------*/
+//--------------------------------------------------------------------------
+// Stuff to support the loadable device drivers.
+//--------------------------------------------------------------------------
#ifdef ENABLE_DYNDRIVERS
typedef struct
@@ -366,4 +366,4 @@
static int nloadabledrivers = 0;
-#endif /* __PLCORE_H__ */
+#endif // __PLCORE_H__
Modified: trunk/include/pldebug.h
===================================================================
--- trunk/include/pldebug.h 2010-10-22 00:17:31 UTC (rev 11268)
+++ trunk/include/pldebug.h 2010-10-22 00:25:36 UTC (rev 11269)
@@ -1,25 +1,25 @@
-/* $Id$
- *
- * Copyright (C) 1995 by Maurice J. LeBrun
- *
- * Debugging support for PLplot.
- *
- * This software may be freely copied, modified and redistributed without
- * fee provided that this copyright notice is preserved intact on all
- * copies and modified copies.
- *
- * There is no warranty or other guarantee of fitness of this software.
- * It is provided solely "as is". The author(s) disclaim(s) all
- * responsibility and liability with respect to this software's usage or
- * its effect upon hardware or computer systems.
- */
+// $Id$
+//
+// Copyright (C) 1995 by Maurice J. LeBrun
+//
+// Debugging support for PLplot.
+//
+// This software may be freely copied, modified and redistributed without
+// fee provided that this copyright notice is preserved intact on all
+// copies and modified copies.
+//
+// There is no warranty or other guarantee of fitness of this software.
+// It is provided solely "as is". The author(s) disclaim(s) all
+// responsibility and liability with respect to this software's usage or
+// its effect upon hardware or computer systems.
+//
#ifndef __PLDEBUG_H__
#define __PLDEBUG_H__
#include <stdarg.h>
-/* For the truly desperate debugging task */
+// For the truly desperate debugging task
#ifdef DEBUG_ENTER
#define dbug_enter( a ) \
@@ -30,32 +30,32 @@
#define dbug_enter( a )
#endif
-/* If we're using a debugging malloc, include the header file here */
+// If we're using a debugging malloc, include the header file here
#ifdef DEBUGGING_MALLOC
#include <malloc.h>
#endif
-/*--------------------------------------------------------------------------*\
- * pldebug()
- *
- * Included into every plplot source file to control debugging output. To
- * enable printing of debugging output, you must #define DEBUG before
- * including plplotP.h or specify -DDEBUG in the compile line, for each file
- * that you want to have debug output enabled. When running the program you
- * must in addition specify -debug. This allows debugging output to tailored
- * to many different circumstances but otherwise be fairly unobtrusive.
- *
- * Note, any file that actually uses pldebug() must also define NEED_PLDEBUG
- * before the plplotP.h include. This is to eliminate warnings caused by
- * those files in which this is defined but never referenced. All this could
- * be much nicer if CPP had the abilities of m4, sigh..
- *
- ...
[truncated message content] |
|
From: <ai...@us...> - 2013-07-09 16:28:30
|
Revision: 12408
http://sourceforge.net/p/plplot/code/12408
Author: airwin
Date: 2013-07-09 16:28:26 +0000 (Tue, 09 Jul 2013)
Log Message:
-----------
Move from *.cmake form to *.in form for configurable files.
Modified Paths:
--------------
trunk/include/CMakeLists.txt
Added Paths:
-----------
trunk/include/plConfig.h.in
trunk/include/plDevs.h.in
Removed Paths:
-------------
trunk/include/plConfig.h.cmake
trunk/include/plDevs.h.cmake
Modified: trunk/include/CMakeLists.txt
===================================================================
--- trunk/include/CMakeLists.txt 2013-07-09 06:03:41 UTC (rev 12407)
+++ trunk/include/CMakeLists.txt 2013-07-09 16:28:26 UTC (rev 12408)
@@ -20,12 +20,12 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
configure_file(
- ${CMAKE_CURRENT_SOURCE_DIR}/plConfig.h.cmake
+ ${CMAKE_CURRENT_SOURCE_DIR}/plConfig.h.in
${CMAKE_CURRENT_BINARY_DIR}/plConfig.h
)
configure_file(
- ${CMAKE_CURRENT_SOURCE_DIR}/plDevs.h.cmake
+ ${CMAKE_CURRENT_SOURCE_DIR}/plDevs.h.in
${CMAKE_CURRENT_BINARY_DIR}/plDevs.h
)
Deleted: trunk/include/plConfig.h.cmake
===================================================================
--- trunk/include/plConfig.h.cmake 2013-07-09 06:03:41 UTC (rev 12407)
+++ trunk/include/plConfig.h.cmake 2013-07-09 16:28:26 UTC (rev 12408)
@@ -1,109 +0,0 @@
-// -*-C-*-
-// $Id$
-//
-// Maurice LeBrun
-// IFS, University of Texas at Austin
-// 18-Jul-1994
-//
-// Copyright (C) 2004, 2006, 2007, 2008, 2009 Alan W. Irwin
-// Copyright (C) 2004 Rafael Laboissiere
-// Copyright (C) 2004 Joao Cardoso
-//
-// This file is part of PLplot.
-//
-// PLplot is free software; you can redistribute it and/or modify
-// it under the terms of the GNU Library General Public License as published
-// by the Free Software Foundation; either version 2 of the License, or
-// (at your option) any later version.
-//
-// PLplot is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Library General Public License for more details.
-//
-// You should have received a copy of the GNU Library General Public License
-// along with PLplot; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-//
-//
-
-// Configured (by CMake) macros for PLplot that are required for the
-// core build and the build of the installed
-// examples (and presumably any user applications). Therefore, the
-// configured plConfig.h should be installed. In contrast,
-// config.h.cmake (note, plConfig.h #includes config.h for
-// the core build because HAVE_CONFIG_H is #defined in that case)
-// contains configured macros that are only required for the core
-// build. Therefore, in contrast to plConfig.h, config.h should not
-// be installed.
-//
-// Maintenance issue: in makes no sense to configure duplicate macros
-// for both config.h and plConfig.h. Therefore, when adding a macro
-// decide which file to put it in depending on whether the result is
-// needed for the installed examples build or not. Furthermore, move
-// configured macros from one file to the other as needed depending on
-// that criterion, but do not copy them.
-//
-//
-
-#ifndef __PLCONFIG_H__
-#define __PLCONFIG_H__
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-// Define if you have c++ accessible stdint.h
-#cmakedefine PL_HAVE_CXX_STDINT_H
-
-// Define if snprintf is available
-#ifndef PL_HAVE_SNPRINTF
-#cmakedefine PL_HAVE_SNPRINTF
-#endif
-
-// Define if _snprintf is available
-#ifndef _PL_HAVE_SNPRINTF
-#cmakedefine _PL_HAVE_SNPRINTF
-#endif
-
-// Define if isfinite is available
-#cmakedefine PL_HAVE_ISFINITE
-
-// Define if finite is available
-#cmakedefine PL_HAVE_FINITE
-
-// Define if _finite is available
-#cmakedefine PL__HAVE_FINITE
-
-// Define if isinf is available
-#cmakedefine PL_HAVE_ISINF
-
-// Define if _isinf is available
-#cmakedefine PL__HAVE_ISINF
-
-// Define if isnan is available
-#cmakedefine PL_HAVE_ISNAN
-
-// Define if _isnan is available
-#cmakedefine PL__HAVE_ISNAN
-
-// Define to 1 if you have the <stdint.h> header file.
-#cmakedefine PL_HAVE_STDINT_H 1
-
-// Define to 1 if you have the <unistd.h> header file.
-#cmakedefine PL_HAVE_UNISTD_H 1
-
-// Define if usleep is available
-#cmakedefine PL_HAVE_USLEEP
-
-// Define if you want PLplot's float type to be double
-#cmakedefine PL_DOUBLE
-
-// Define if C++ compiler accepts using namespace
-#cmakedefine PL_USE_NAMESPACE
-
-// Define if isnan is present in <math.h> but not in <cmath>
-// - broken Mac OSX systems
-#cmakedefine PL_BROKEN_ISNAN_CXX
-
-#endif // __PLCONFIG_H__
Copied: trunk/include/plConfig.h.in (from rev 12396, trunk/include/plConfig.h.cmake)
===================================================================
--- trunk/include/plConfig.h.in (rev 0)
+++ trunk/include/plConfig.h.in 2013-07-09 16:28:26 UTC (rev 12408)
@@ -0,0 +1,109 @@
+// -*-C-*-
+// $Id$
+//
+// Maurice LeBrun
+// IFS, University of Texas at Austin
+// 18-Jul-1994
+//
+// Copyright (C) 2004, 2006, 2007, 2008, 2009 Alan W. Irwin
+// Copyright (C) 2004 Rafael Laboissiere
+// Copyright (C) 2004 Joao Cardoso
+//
+// This file is part of PLplot.
+//
+// PLplot is free software; you can redistribute it and/or modify
+// it under the terms of the GNU Library General Public License as published
+// by the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version.
+//
+// PLplot is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU Library General Public License for more details.
+//
+// You should have received a copy of the GNU Library General Public License
+// along with PLplot; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+//
+//
+
+// Configured (by CMake) macros for PLplot that are required for the
+// core build and the build of the installed
+// examples (and presumably any user applications). Therefore, the
+// configured plConfig.h should be installed. In contrast,
+// config.h.cmake (note, plConfig.h #includes config.h for
+// the core build because HAVE_CONFIG_H is #defined in that case)
+// contains configured macros that are only required for the core
+// build. Therefore, in contrast to plConfig.h, config.h should not
+// be installed.
+//
+// Maintenance issue: in makes no sense to configure duplicate macros
+// for both config.h and plConfig.h. Therefore, when adding a macro
+// decide which file to put it in depending on whether the result is
+// needed for the installed examples build or not. Furthermore, move
+// configured macros from one file to the other as needed depending on
+// that criterion, but do not copy them.
+//
+//
+
+#ifndef __PLCONFIG_H__
+#define __PLCONFIG_H__
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+// Define if you have c++ accessible stdint.h
+#cmakedefine PL_HAVE_CXX_STDINT_H
+
+// Define if snprintf is available
+#ifndef PL_HAVE_SNPRINTF
+#cmakedefine PL_HAVE_SNPRINTF
+#endif
+
+// Define if _snprintf is available
+#ifndef _PL_HAVE_SNPRINTF
+#cmakedefine _PL_HAVE_SNPRINTF
+#endif
+
+// Define if isfinite is available
+#cmakedefine PL_HAVE_ISFINITE
+
+// Define if finite is available
+#cmakedefine PL_HAVE_FINITE
+
+// Define if _finite is available
+#cmakedefine PL__HAVE_FINITE
+
+// Define if isinf is available
+#cmakedefine PL_HAVE_ISINF
+
+// Define if _isinf is available
+#cmakedefine PL__HAVE_ISINF
+
+// Define if isnan is available
+#cmakedefine PL_HAVE_ISNAN
+
+// Define if _isnan is available
+#cmakedefine PL__HAVE_ISNAN
+
+// Define to 1 if you have the <stdint.h> header file.
+#cmakedefine PL_HAVE_STDINT_H 1
+
+// Define to 1 if you have the <unistd.h> header file.
+#cmakedefine PL_HAVE_UNISTD_H 1
+
+// Define if usleep is available
+#cmakedefine PL_HAVE_USLEEP
+
+// Define if you want PLplot's float type to be double
+#cmakedefine PL_DOUBLE
+
+// Define if C++ compiler accepts using namespace
+#cmakedefine PL_USE_NAMESPACE
+
+// Define if isnan is present in <math.h> but not in <cmath>
+// - broken Mac OSX systems
+#cmakedefine PL_BROKEN_ISNAN_CXX
+
+#endif // __PLCONFIG_H__
Deleted: trunk/include/plDevs.h.cmake
===================================================================
--- trunk/include/plDevs.h.cmake 2013-07-09 06:03:41 UTC (rev 12407)
+++ trunk/include/plDevs.h.cmake 2013-07-09 16:28:26 UTC (rev 12408)
@@ -1,102 +0,0 @@
-// -*-C-*-
-// $Id$
-//
-// Maurice LeBrun
-// IFS, University of Texas at Austin
-// 18-Jul-1994
-//
-// Contains macro definitions that determine what device drivers are
-// compiled into the PLplot library. On a Unix system, typically the
-// configure script builds plDevs.h from plDevs.h.in. Elsewhere, it's
-// best to hand-configure a plDevs.h file and keep it with the
-// system-specific files.
-//
-// Copyright (C) 2004 Andrew Roach
-// Copyright (C) 2005 Thomas J. Duck
-// Copyright (C) 2006 Andrew Ross
-// Copyright (C) 2006 Alan W. Irwin
-//
-// This file is part of PLplot.
-//
-// PLplot is free software; you can redistribute it and/or modify
-// it under the terms of the GNU Library General Public License as published
-// by the Free Software Foundation; either version 2 of the License, or
-// (at your option) any later version.
-//
-// PLplot is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Library General Public License for more details.
-//
-// You should have received a copy of the GNU Library General Public License
-// along with PLplot; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-//
-//
-
-#ifndef __PLDEVS_H__
-#define __PLDEVS_H__
-
-#cmakedefine PDL_aqt
-#cmakedefine PLD_plmeta
-#cmakedefine PLD_null
-#cmakedefine PLD_xterm
-#cmakedefine PLD_tek4010
-#cmakedefine PLD_tek4010f
-#cmakedefine PLD_tek4107
-#cmakedefine PLD_tek4107f
-#cmakedefine PLD_mskermit
-#cmakedefine PLD_vlt
-#cmakedefine PLD_versaterm
-#cmakedefine PLD_conex
-#cmakedefine PLD_linuxvga
-#cmakedefine PLD_dg300
-#cmakedefine PLD_png
-#cmakedefine PLD_jpeg
-#cmakedefine PLD_gif
-#cmakedefine PLD_cgm
-#cmakedefine PLD_ps
-#cmakedefine PLD_xfig
-#cmakedefine PLD_ljiip
-#cmakedefine PLD_ljii
-#cmakedefine PLD_lj_hpgl
-#cmakedefine PLD_hp7470
-#cmakedefine PLD_hp7580
-#cmakedefine PLD_imp
-#cmakedefine PLD_xwin
-#cmakedefine PLD_tk
-#cmakedefine PLD_pbm
-#cmakedefine PLD_gcw
-#cmakedefine PLD_gnome
-#cmakedefine PLD_pstex
-#cmakedefine PLD_psttf
-#cmakedefine PLD_ntk
-#cmakedefine PLD_tkwin
-#cmakedefine PLD_mem
-#cmakedefine PLD_wingcc
-#cmakedefine PLD_wxwidgets
-#cmakedefine PLD_wxpng
-#cmakedefine PLD_svg
-#cmakedefine PLD_pdf
-#cmakedefine PLD_xcairo
-#cmakedefine PLD_pdfcairo
-#cmakedefine PLD_pscairo
-#cmakedefine PLD_epscairo
-#cmakedefine PLD_svgcairo
-#cmakedefine PLD_pngcairo
-#cmakedefine PLD_memcairo
-#cmakedefine PLD_extcairo
-#cmakedefine PLD_wincairo
-#cmakedefine PLD_bmpqt
-#cmakedefine PLD_jpgqt
-#cmakedefine PLD_pngqt
-#cmakedefine PLD_ppmqt
-#cmakedefine PLD_tiffqt
-#cmakedefine PLD_svgqt
-#cmakedefine PLD_epsqt
-#cmakedefine PLD_pdfqt
-#cmakedefine PLD_qtwidget
-#cmakedefine PLD_extqt
-#cmakedefine PLD_memqt
-
-#endif // __PLDEVS_H__
Copied: trunk/include/plDevs.h.in (from rev 12396, trunk/include/plDevs.h.cmake)
===================================================================
--- trunk/include/plDevs.h.in (rev 0)
+++ trunk/include/plDevs.h.in 2013-07-09 16:28:26 UTC (rev 12408)
@@ -0,0 +1,102 @@
+// -*-C-*-
+// $Id$
+//
+// Maurice LeBrun
+// IFS, University of Texas at Austin
+// 18-Jul-1994
+//
+// Contains macro definitions that determine what device drivers are
+// compiled into the PLplot library. On a Unix system, typically the
+// configure script builds plDevs.h from plDevs.h.in. Elsewhere, it's
+// best to hand-configure a plDevs.h file and keep it with the
+// system-specific files.
+//
+// Copyright (C) 2004 Andrew Roach
+// Copyright (C) 2005 Thomas J. Duck
+// Copyright (C) 2006 Andrew Ross
+// Copyright (C) 2006 Alan W. Irwin
+//
+// This file is part of PLplot.
+//
+// PLplot is free software; you can redistribute it and/or modify
+// it under the terms of the GNU Library General Public License as published
+// by the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version.
+//
+// PLplot is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU Library General Public License for more details.
+//
+// You should have received a copy of the GNU Library General Public License
+// along with PLplot; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+//
+//
+
+#ifndef __PLDEVS_H__
+#define __PLDEVS_H__
+
+#cmakedefine PDL_aqt
+#cmakedefine PLD_plmeta
+#cmakedefine PLD_null
+#cmakedefine PLD_xterm
+#cmakedefine PLD_tek4010
+#cmakedefine PLD_tek4010f
+#cmakedefine PLD_tek4107
+#cmakedefine PLD_tek4107f
+#cmakedefine PLD_mskermit
+#cmakedefine PLD_vlt
+#cmakedefine PLD_versaterm
+#cmakedefine PLD_conex
+#cmakedefine PLD_linuxvga
+#cmakedefine PLD_dg300
+#cmakedefine PLD_png
+#cmakedefine PLD_jpeg
+#cmakedefine PLD_gif
+#cmakedefine PLD_cgm
+#cmakedefine PLD_ps
+#cmakedefine PLD_xfig
+#cmakedefine PLD_ljiip
+#cmakedefine PLD_ljii
+#cmakedefine PLD_lj_hpgl
+#cmakedefine PLD_hp7470
+#cmakedefine PLD_hp7580
+#cmakedefine PLD_imp
+#cmakedefine PLD_xwin
+#cmakedefine PLD_tk
+#cmakedefine PLD_pbm
+#cmakedefine PLD_gcw
+#cmakedefine PLD_gnome
+#cmakedefine PLD_pstex
+#cmakedefine PLD_psttf
+#cmakedefine PLD_ntk
+#cmakedefine PLD_tkwin
+#cmakedefine PLD_mem
+#cmakedefine PLD_wingcc
+#cmakedefine PLD_wxwidgets
+#cmakedefine PLD_wxpng
+#cmakedefine PLD_svg
+#cmakedefine PLD_pdf
+#cmakedefine PLD_xcairo
+#cmakedefine PLD_pdfcairo
+#cmakedefine PLD_pscairo
+#cmakedefine PLD_epscairo
+#cmakedefine PLD_svgcairo
+#cmakedefine PLD_pngcairo
+#cmakedefine PLD_memcairo
+#cmakedefine PLD_extcairo
+#cmakedefine PLD_wincairo
+#cmakedefine PLD_bmpqt
+#cmakedefine PLD_jpgqt
+#cmakedefine PLD_pngqt
+#cmakedefine PLD_ppmqt
+#cmakedefine PLD_tiffqt
+#cmakedefine PLD_svgqt
+#cmakedefine PLD_epsqt
+#cmakedefine PLD_pdfqt
+#cmakedefine PLD_qtwidget
+#cmakedefine PLD_extqt
+#cmakedefine PLD_memqt
+
+#endif // __PLDEVS_H__
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X