Menu
▾
▴
[Plplot-cvs] SF.net SVN: plplot:[12334] trunk
|
From: <ai...@us...> - 2013-05-04 16:43:38
|
Revision: 12334
http://sourceforge.net/p/plplot/code/12334
Author: airwin
Date: 2013-05-04 16:43:33 +0000 (Sat, 04 May 2013)
Log Message:
-----------
Solve name clash with HAVE_FREETYPE defined in octave headers by
renaming the PLplot version PL_HAVE_FREETYPE. This change should
be complete because it was done using a combination of find on
the whole source tree and sed, i.e., using the command
for FILE in $(find -type f |grep -v .svn |xargs grep -l HAVE_FREETYPE); do
echo $FILE
sed -e "s?HAVE_FREETYPE?PL_HAVE_FREETYPE?g" <$FILE >| /tmp/test_software
\mv /tmp/test_software $FILE
done
One tab was changed afterwards by hand in the output for
cmake/modules/summary.cmake, but otherwise visual inspection
of these changes showed no issues with this find/sed approach
to implement this wholesale change.
Tested by: Alan W. Irwin <ai...@us...> using the
test_interactive target.
Modified Paths:
--------------
trunk/bindings/gnome2/lib/gcw-lib.c
trunk/bindings/wxwidgets/wxPLplotstream.cpp
trunk/bindings/wxwidgets/wxPLplotstream.h.in
trunk/cmake/modules/freetype.cmake
trunk/cmake/modules/summary.cmake
trunk/config.h.cmake
trunk/doc/docbook/src/advanced.xml
trunk/drivers/gcw.c
trunk/drivers/gd.c
trunk/drivers/wingcc.c
trunk/drivers/wxwidgets.cpp
trunk/drivers/wxwidgets.h
trunk/drivers/wxwidgets_agg.cpp
trunk/drivers/wxwidgets_dc.cpp
trunk/drivers/wxwidgets_gc.cpp
trunk/include/plfreetype.h
trunk/include/plplotP.h
trunk/src/plfreetype.c
Modified: trunk/bindings/gnome2/lib/gcw-lib.c
===================================================================
--- trunk/bindings/gnome2/lib/gcw-lib.c 2013-05-04 16:35:59 UTC (rev 12333)
+++ trunk/bindings/gnome2/lib/gcw-lib.c 2013-05-04 16:43:33 UTC (rev 12334)
@@ -886,7 +886,7 @@
gcw_debug( "<gcw_use_text>\n" );
#endif
-#ifdef HAVE_FREETYPE
+#ifdef PL_HAVE_FREETYPE
if ( use_text )
plsc->dev_text = 1; // Allow text handling
Modified: trunk/bindings/wxwidgets/wxPLplotstream.cpp
===================================================================
--- trunk/bindings/wxwidgets/wxPLplotstream.cpp 2013-05-04 16:35:59 UTC (rev 12333)
+++ trunk/bindings/wxwidgets/wxPLplotstream.cpp 2013-05-04 16:43:33 UTC (rev 12334)
@@ -59,7 +59,7 @@
// use freetype, antialized canvas?
char drvopt[bufferSize], buffer[bufferSize];
drvopt[0] = '\0';
-#ifdef WX_TEMP_HAVE_FREETYPE_IS_ON
+#ifdef WX_TEMP_PL_HAVE_FREETYPE_IS_ON
sprintf( buffer, "freetype=%d,smooth=%d,",
m_style & wxPLPLOT_FREETYPE ? 1 : 0,
m_style & wxPLPLOT_SMOOTH_TEXT ? 1 : 0 );
Modified: trunk/bindings/wxwidgets/wxPLplotstream.h.in
===================================================================
--- trunk/bindings/wxwidgets/wxPLplotstream.h.in 2013-05-04 16:35:59 UTC (rev 12333)
+++ trunk/bindings/wxwidgets/wxPLplotstream.h.in 2013-05-04 16:43:33 UTC (rev 12334)
@@ -32,7 +32,7 @@
// if freetype is available - in the code we have checks
// for the WX_TEMP_...._IS_ON macros (otherwise WX_TEMP_...._IS_OFF
// is defined)
-#define WX_TEMP_HAVE_FREETYPE_IS_@HAVE_FREETYPE@
+#define WX_TEMP_PL_HAVE_FREETYPE_IS_@PL_HAVE_FREETYPE@
//! Style options for wxPLplotstream:
// wxPLPLOT_NONE: no option
@@ -47,7 +47,7 @@
enum
{
wxPLPLOT_NONE = 0,
-#ifdef WX_TEMP_HAVE_FREETYPE_IS_ON
+#ifdef WX_TEMP_PL_HAVE_FREETYPE_IS_ON
wxPLPLOT_FREETYPE = 1 << 0,
wxPLPLOT_SMOOTH_TEXT = 1 << 1,
#endif
Modified: trunk/cmake/modules/freetype.cmake
===================================================================
--- trunk/cmake/modules/freetype.cmake 2013-05-04 16:35:59 UTC (rev 12333)
+++ trunk/cmake/modules/freetype.cmake 2013-05-04 16:43:33 UTC (rev 12334)
@@ -121,5 +121,5 @@
endif (WITH_FREETYPE)
if (WITH_FREETYPE)
- set(HAVE_FREETYPE ON)
+ set(PL_HAVE_FREETYPE ON)
endif (WITH_FREETYPE)
Modified: trunk/cmake/modules/summary.cmake
===================================================================
--- trunk/cmake/modules/summary.cmake 2013-05-04 16:35:59 UTC (rev 12333)
+++ trunk/cmake/modules/summary.cmake 2013-05-04 16:43:33 UTC (rev 12334)
@@ -106,7 +106,7 @@
Optional libraries:
PL_HAVE_QHULL: ${PL_HAVE_QHULL} WITH_CSA: ${WITH_CSA}
-HAVE_FREETYPE: ${HAVE_FREETYPE} PL_HAVE_PTHREAD: ${PL_HAVE_PTHREAD}
+PL_HAVE_FREETYPE: ${PL_HAVE_FREETYPE} PL_HAVE_PTHREAD: ${PL_HAVE_PTHREAD}
HAVE_AGG: ${HAVE_AGG} HAVE_SHAPELIB: ${HAVE_SHAPELIB}
Language Bindings:
Modified: trunk/config.h.cmake
===================================================================
--- trunk/config.h.cmake 2013-05-04 16:35:59 UTC (rev 12333)
+++ trunk/config.h.cmake 2013-05-04 16:43:33 UTC (rev 12334)
@@ -52,7 +52,7 @@
#cmakedefine HAVE_DLFCN_H 1
// Define if [freetype] is available
-#cmakedefine HAVE_FREETYPE
+#cmakedefine PL_HAVE_FREETYPE
// Define if [shapelib] is available
#cmakedefine HAVE_SHAPELIB
Modified: trunk/doc/docbook/src/advanced.xml
===================================================================
--- trunk/doc/docbook/src/advanced.xml 2013-05-04 16:35:59 UTC (rev 12333)
+++ trunk/doc/docbook/src/advanced.xml 2013-05-04 16:43:33 UTC (rev 12334)
@@ -766,7 +766,7 @@
<filename>gd.c</filename> driver. Here we make some notes to accompany
this driver which should make it easier to migrate other drivers to
use the FreeType library. Every code fragment we mention below should be surrounded
- with a <literal>#ifdef HAVE_FREETYPE...#endif</literal> to quarantine these
+ with a <literal>#ifdef PL_HAVE_FREETYPE...#endif</literal> to quarantine these
fragments for systems without the FreeType library. For interactive devices that
need caching of text drawing, reference should also be made to
<filename>wingcc.c</filename>.</para>
@@ -938,7 +938,7 @@
if (dev->waiting==1)
{
plRemakePlot(pls);
- #ifdef HAVE_FREETYPE
+ #ifdef PL_HAVE_FREETYPE
pl_RemakeFreeType_text_from_buffer(pls);
#endif
}
@@ -978,7 +978,7 @@
{
fclose(pls->OutFile);
- #ifdef HAVE_FREETYPE
+ #ifdef PL_HAVE_FREETYPE
FT_Data *FT=(FT_Data *)pls->FT;
plscmap0n(FT->ncol0_org);
Modified: trunk/drivers/gcw.c
===================================================================
--- trunk/drivers/gcw.c 2013-05-04 16:35:59 UTC (rev 12333)
+++ trunk/drivers/gcw.c 2013-05-04 16:43:33 UTC (rev 12334)
@@ -75,7 +75,7 @@
#include "gcw.h"
#include "plplotcanvas-hacktext.h"
-#ifdef HAVE_FREETYPE
+#ifdef PL_HAVE_FREETYPE
#include "plfreetype.h"
#include "plfci-truetype.h"
@@ -83,7 +83,7 @@
// Font lookup table that is constructed in plD_FreeType_init
extern FCI_to_FontName_Table FontLookup[N_TrueTypeLookup];
-#endif // HAVE_FREETYPE
+#endif // PL_HAVE_FREETYPE
// Device info
@@ -91,7 +91,7 @@
// Global driver options
-#ifdef HAVE_FREETYPE
+#ifdef PL_HAVE_FREETYPE
static PLINT text = 1;
#else
static PLINT text = 0;
@@ -204,7 +204,7 @@
pls->dev = dev;
// Set text handling
-#ifdef HAVE_FREETYPE
+#ifdef PL_HAVE_FREETYPE
if ( text )
{
pls->dev_text = TRUE;
@@ -724,7 +724,7 @@
gcw_debug( "<plD_tidy_gcw>\n" );
#endif
-#ifdef HAVE_FREETYPE
+#ifdef PL_HAVE_FREETYPE
if ( pls->dev_text )
{
FT_Data *FT = (FT_Data *) pls->FT;
@@ -952,7 +952,7 @@
}
}
-#ifdef HAVE_FREETYPE
+#ifdef PL_HAVE_FREETYPE
//--------------------------------------------------------------------------
// proc_str()
//
@@ -1252,7 +1252,7 @@
gcw_debug( "</proc_str>\n" );
#endif
}
-#endif //HAVE_FREETYPE
+#endif //PL_HAVE_FREETYPE
//--------------------------------------------------------------------------
@@ -1298,7 +1298,7 @@
fill_polygon( pls );
break;
-#ifdef HAVE_FREETYPE
+#ifdef PL_HAVE_FREETYPE
case PLESC_HAS_TEXT:
proc_str( pls, ptr ); // Draw the text
break;
Modified: trunk/drivers/gd.c
===================================================================
--- trunk/drivers/gd.c 2013-05-04 16:35:59 UTC (rev 12333)
+++ trunk/drivers/gd.c 2013-05-04 16:43:33 UTC (rev 12334)
@@ -145,12 +145,12 @@
;
#if GD2_VERS >= 2
-#ifdef HAVE_FREETYPE
+#ifdef PL_HAVE_FREETYPE
#define SMOOTH_LINES_OK
#endif
#endif
-#ifdef HAVE_FREETYPE
+#ifdef PL_HAVE_FREETYPE
//
// Freetype support has been added to the GD family of drivers using the
@@ -159,7 +159,7 @@
// "PLESC_HAS_TEXT" command for rendering within the driver.
//
// Freetype support is turned on/off at compile time by defining
-// "HAVE_FREETYPE".
+// "PL_HAVE_FREETYPE".
//
// To give the user some level of control over the fonts that are used,
// environmental variables can be set to over-ride the definitions used by
@@ -185,7 +185,7 @@
static void plD_init_gif_Dev( PLStream *pls );
#endif
-#ifdef HAVE_FREETYPE
+#ifdef PL_HAVE_FREETYPE
static void plD_pixel_gd( PLStream *pls, short x, short y );
static PLINT plD_read_pixel_gd( PLStream *pls, short x, short y );
@@ -368,7 +368,7 @@
static int palette = 0;
static int smooth_line = 0;
#endif
-#ifdef HAVE_FREETYPE
+#ifdef PL_HAVE_FREETYPE
static int freetype = 1;
static int smooth_text = 1;
FT_Data *FT;
@@ -382,7 +382,7 @@
{ "24bit", DRV_INT, &truecolour, "Truecolor (24 bit) mode" },
{ "smoothlines", DRV_INT, &smooth_line, "Turn line Anti Aliasing on (1) or off (0)" },
#endif
-#ifdef HAVE_FREETYPE
+#ifdef PL_HAVE_FREETYPE
{ "text", DRV_INT, &freetype, "Use driver text (FreeType)" },
{ "smooth", DRV_INT, &smooth_text, "Turn text smoothing on (1) or off (0)" },
#endif
@@ -432,7 +432,7 @@
#endif
-#ifdef HAVE_FREETYPE
+#ifdef PL_HAVE_FREETYPE
if ( freetype )
{
pls->dev_text = 1; // want to draw text
@@ -529,7 +529,7 @@
plP_setphy( 0, dev->scale * dev->pngx, 0, dev->scale * dev->pngy );
-#ifdef HAVE_FREETYPE
+#ifdef PL_HAVE_FREETYPE
if ( pls->dev_text )
{
init_freetype_lv2( pls );
@@ -558,7 +558,7 @@
static int black15 = 0;
static int red15 = 0;
-#ifdef HAVE_FREETYPE
+#ifdef PL_HAVE_FREETYPE
static int freetype = 1;
static int smooth_text = 0;
FT_Data *FT;
@@ -566,7 +566,7 @@
DrvOpt gd_options[] = { { "def_black15", DRV_INT, &black15, "Define idx 15 as black. If the background is \"whiteish\" (from \"-bg\" option), force index 15 (traditionally white) to be \"black\"" },
{ "swp_red15", DRV_INT, &red15, "Swap index 1 (usually red) and 1 (usually white); always done after \"black15\"; quite useful for quick changes to web pages" },
-#ifdef HAVE_FREETYPE
+#ifdef PL_HAVE_FREETYPE
{ "text", DRV_INT, &freetype, "Use driver text (FreeType)" },
{ "smooth", DRV_INT, &smooth_text, "Turn text smoothing on (1) or off (0)" },
#endif
@@ -597,7 +597,7 @@
dev->palette = 1; // Always use palette mode for GIF files
dev->truecolour = 0; // Never have truecolour in GIFS
-#ifdef HAVE_FREETYPE
+#ifdef PL_HAVE_FREETYPE
if ( freetype )
{
pls->dev_text = 1; // want to draw text
@@ -684,7 +684,7 @@
plP_setphy( 0, dev->scale * dev->pngx, 0, dev->scale * dev->pngy );
-#ifdef HAVE_FREETYPE
+#ifdef PL_HAVE_FREETYPE
if ( pls->dev_text )
{
init_freetype_lv2( pls );
@@ -1046,7 +1046,7 @@
fill_polygon( pls );
break;
-#ifdef HAVE_FREETYPE
+#ifdef PL_HAVE_FREETYPE
case PLESC_HAS_TEXT:
plD_render_freetype_text( pls, (EscText *) ptr );
break;
@@ -1145,7 +1145,7 @@
void plD_tidy_png( PLStream *pls )
{
-#ifdef HAVE_FREETYPE
+#ifdef PL_HAVE_FREETYPE
if ( pls->dev_text )
{
plD_FreeType_Destroy( pls );
@@ -1352,7 +1352,7 @@
#endif
-#ifdef HAVE_FREETYPE
+#ifdef PL_HAVE_FREETYPE
//--------------------------------------------------------------------------
// void plD_pixel_gd (PLStream *pls, short x, short y)
Modified: trunk/drivers/wingcc.c
===================================================================
--- trunk/drivers/wingcc.c 2013-05-04 16:35:59 UTC (rev 12333)
+++ trunk/drivers/wingcc.c 2013-05-04 16:43:33 UTC (rev 12334)
@@ -37,7 +37,7 @@
#include "drivers.h"
#include "plevent.h"
-#ifdef HAVE_FREETYPE
+#ifdef PL_HAVE_FREETYPE
//
// Freetype support has been added to the wingcc driver using the
@@ -46,7 +46,7 @@
// "PLESC_HAS_TEXT" command for rendering within the driver.
//
// Freetype support is turned on/off at compile time by defining
-// "HAVE_FREETYPE".
+// "PL_HAVE_FREETYPE".
//
// To give the user some level of control over the fonts that are used,
// environmental variables can be set to over-ride the definitions used by
@@ -129,7 +129,7 @@
void plD_state_wingcc( PLStream *, PLINT );
void plD_esc_wingcc( PLStream *, PLINT, void * );
-#ifdef HAVE_FREETYPE
+#ifdef PL_HAVE_FREETYPE
static void plD_pixel_wingcc( PLStream *pls, short x, short y );
static void plD_pixelV_wingcc( PLStream *pls, short x, short y );
@@ -408,7 +408,7 @@
{
wingcc_Dev *dev;
-#ifdef HAVE_FREETYPE
+#ifdef PL_HAVE_FREETYPE
static int freetype = 0;
static int smooth_text = 0;
static int save_reg = 0;
@@ -424,7 +424,7 @@
#endif
DrvOpt wingcc_options[] = {
-#ifdef HAVE_FREETYPE
+#ifdef PL_HAVE_FREETYPE
{ "text", DRV_INT, &freetype, "Use driver text (FreeType)" },
{ "smooth", DRV_INT, &smooth_text, "Turn text smoothing on (1) or off (0)" },
{ "save", DRV_INT, &save_reg, "Save defaults to registary" },
@@ -464,7 +464,7 @@
pls->color = 1;
-#ifdef HAVE_FREETYPE
+#ifdef PL_HAVE_FREETYPE
//
// Read registry to see if the user has set up default values
@@ -482,7 +482,7 @@
plParseDrvOpts( wingcc_options );
-#ifdef HAVE_FREETYPE
+#ifdef PL_HAVE_FREETYPE
//
// We will now save the settings to the registary if the user wants
@@ -603,7 +603,7 @@
AppendMenu( dev->PopupMenu, MF_STRING, PopupNextPage, _T( "Next Page" ) );
AppendMenu( dev->PopupMenu, MF_STRING, PopupQuit, _T( "Quit" ) );
-#ifdef HAVE_FREETYPE
+#ifdef PL_HAVE_FREETYPE
if ( freetype )
{
@@ -674,7 +674,7 @@
else
SetPolyFillMode( dev->hdc, WINDING );
-#ifdef HAVE_FREETYPE
+#ifdef PL_HAVE_FREETYPE
if ( pls->dev_text )
{
init_freetype_lv2( pls );
@@ -900,7 +900,7 @@
plD_bop_wingcc( PLStream *pls )
{
wingcc_Dev *dev = (wingcc_Dev *) pls->dev;
-#ifdef HAVE_FREETYPE
+#ifdef PL_HAVE_FREETYPE
FT_Data *FT = (FT_Data *) pls->FT;
#endif
Debug( "Start of Page\t" );
@@ -922,7 +922,7 @@
{
wingcc_Dev *dev = NULL;
-#ifdef HAVE_FREETYPE
+#ifdef PL_HAVE_FREETYPE
if ( pls->dev_text )
{
FT_Data *FT = (FT_Data *) pls->FT;
@@ -1010,7 +1010,7 @@
SetROP2( dev->hdc, R2_XORPEN );
break;
-#ifdef HAVE_FREETYPE
+#ifdef PL_HAVE_FREETYPE
case PLESC_HAS_TEXT:
plD_render_freetype_text( pls, (EscText *) ptr );
break;
@@ -1039,7 +1039,7 @@
static void Resize( PLStream *pls )
{
wingcc_Dev *dev = (wingcc_Dev *) pls->dev;
-#ifdef HAVE_FREETYPE
+#ifdef PL_HAVE_FREETYPE
FT_Data *FT = (FT_Data *) pls->FT;
#endif
Debug( "Resizing" );
@@ -1066,7 +1066,7 @@
dev->scale = (PLFLT) PIXELS_Y / dev->height;
}
-#ifdef HAVE_FREETYPE
+#ifdef PL_HAVE_FREETYPE
if ( FT )
{
FT->scale = dev->scale;
@@ -1146,7 +1146,7 @@
return ( ret );
}
-#ifdef HAVE_FREETYPE
+#ifdef PL_HAVE_FREETYPE
//--------------------------------------------------------------------------
// void plD_pixel_wingcc (PLStream *pls, short x, short y)
@@ -1330,7 +1330,7 @@
static void UpdatePageMetrics( PLStream *pls, char flag )
{
wingcc_Dev *dev = (wingcc_Dev *) pls->dev;
- #ifdef HAVE_FREETYPE
+ #ifdef PL_HAVE_FREETYPE
FT_Data *FT = (FT_Data *) pls->FT;
#endif
@@ -1355,7 +1355,7 @@
dev->scale = (PLFLT) PIXELS_Y / dev->height;
}
- #ifdef HAVE_FREETYPE
+ #ifdef PL_HAVE_FREETYPE
if ( FT ) // If we are using freetype, then set it up next
{
FT->scale = dev->scale;
@@ -1384,7 +1384,7 @@
static void PrintPage( PLStream *pls )
{
wingcc_Dev *dev = (wingcc_Dev *) pls->dev;
- #ifdef HAVE_FREETYPE
+ #ifdef PL_HAVE_FREETYPE
FT_Data *FT = (FT_Data *) pls->FT;
#endif
PRINTDLG Printer;
@@ -1435,7 +1435,7 @@
UpdatePageMetrics( pls, 1 );
- #ifdef HAVE_FREETYPE
+ #ifdef PL_HAVE_FREETYPE
if ( FT ) // If we are using freetype, then set it up next
{
dev->FT_smooth_text = FT->smooth_text; // When printing, we don't want smoothing
@@ -1458,7 +1458,7 @@
dev->hdc = dev->SCRN_hdc; // Reset the screen HDC to the default
UpdatePageMetrics( pls, 0 );
- #ifdef HAVE_FREETYPE
+ #ifdef PL_HAVE_FREETYPE
if ( FT ) // If we are using freetype, then set it up next
{
FT->smooth_text = dev->FT_smooth_text;
Modified: trunk/drivers/wxwidgets.cpp
===================================================================
--- trunk/drivers/wxwidgets.cpp 2013-05-04 16:35:59 UTC (rev 12333)
+++ trunk/drivers/wxwidgets.cpp 2013-05-04 16:43:33 UTC (rev 12334)
@@ -42,7 +42,7 @@
#include "wxwidgets.h"
// Static function prototypes
-#ifdef HAVE_FREETYPE
+#ifdef PL_HAVE_FREETYPE
static void plD_pixel_wxwidgets( PLStream *pls, short x, short y );
static PLINT plD_read_pixel_wxwidgets( PLStream *pls, short x, short y );
static void plD_set_pixel_wxwidgets( PLStream *pls, short x, short y, PLINT colour );
@@ -352,7 +352,7 @@
#endif
DrvOpt wx_options[] = {
-#ifdef HAVE_FREETYPE
+#ifdef PL_HAVE_FREETYPE
{ "freetype", DRV_INT, &freetype, "Use FreeType library" },
{ "smooth", DRV_INT, &smooth_text, "Turn text smoothing on (1) or off (0)" },
#endif
@@ -431,7 +431,7 @@
pls->dev_hrshsym = 1;
}
-#ifdef HAVE_FREETYPE
+#ifdef PL_HAVE_FREETYPE
// own text routines have higher priority over freetype
// if text and freetype option are set to 1
if ( !text )
@@ -498,7 +498,7 @@
// set dpi
plspage( VIRTUAL_PIXELS_PER_IN / dev->scalex, VIRTUAL_PIXELS_PER_IN / dev->scaley, 0, 0, 0, 0 );
-#ifdef HAVE_FREETYPE
+#ifdef PL_HAVE_FREETYPE
if ( dev->freetype )
init_freetype_lv2( pls );
#endif
@@ -781,7 +781,7 @@
wxPLDevBase* dev = (wxPLDevBase *) pls->dev;
-#ifdef HAVE_FREETYPE
+#ifdef PL_HAVE_FREETYPE
if ( dev->freetype )
{
FT_Data *FT = (FT_Data *) pls->FT;
@@ -886,7 +886,7 @@
if ( dev->freetype )
{
-#ifdef HAVE_FREETYPE
+#ifdef PL_HAVE_FREETYPE
plD_render_freetype_text( pls, (EscText *) ptr );
#endif
}
@@ -1001,7 +1001,7 @@
}
// freetype parameters must also be changed
-#ifdef HAVE_FREETYPE
+#ifdef PL_HAVE_FREETYPE
if ( dev->freetype )
{
FT_Data *FT = (FT_Data *) pls->FT;
@@ -1049,7 +1049,7 @@
-#ifdef HAVE_FREETYPE
+#ifdef PL_HAVE_FREETYPE
//--------------------------------------------------------------------------
// static void plD_pixel_wxwidgets( PLStream *pls, short x, short y )
Modified: trunk/drivers/wxwidgets.h
===================================================================
--- trunk/drivers/wxwidgets.h 2013-05-04 16:35:59 UTC (rev 12333)
+++ trunk/drivers/wxwidgets.h 2013-05-04 16:43:33 UTC (rev 12334)
@@ -26,7 +26,7 @@
#include <wx/spinctrl.h>
// freetype headers and macros
-#ifdef HAVE_FREETYPE
+#ifdef PL_HAVE_FREETYPE
#include "plfreetype.h"
#endif
@@ -100,11 +100,11 @@
virtual void SetColor0( PLStream *pls ) = 0;
virtual void SetColor1( PLStream *pls ) = 0;
virtual void SetExternalBuffer( void* buffer ) = 0;
-#ifdef HAVE_FREETYPE
+#ifdef PL_HAVE_FREETYPE
virtual void PutPixel( short x, short y, PLINT color ) = 0;
virtual void PutPixel( short x, short y ) = 0;
virtual PLINT GetPixel( short x, short y ) = 0;
-#endif // HAVE_FREETYPE
+#endif // PL_HAVE_FREETYPE
virtual void ProcessString( PLStream* pls, EscText* args ) = 0;
virtual void PSDrawText( PLUNICODE* ucs4, int ucs4Len, bool drawText );
virtual void PSDrawTextToDC( char* utf8_string, bool drawText ) = 0;
@@ -193,11 +193,11 @@
void SetColor0( PLStream *pls );
void SetColor1( PLStream *pls );
void SetExternalBuffer( void* buffer );
-#ifdef HAVE_FREETYPE
+#ifdef PL_HAVE_FREETYPE
void PutPixel( short x, short y, PLINT color );
void PutPixel( short x, short y );
PLINT GetPixel( short x, short y );
-#endif // HAVE_FREETYPE
+#endif // PL_HAVE_FREETYPE
void ProcessString( PLStream* pls, EscText* args );
void PSDrawTextToDC( char* utf8_string, bool drawText );
void PSSetFont( PLUNICODE fci );
@@ -256,11 +256,11 @@
void SetColor0( PLStream *pls );
void SetColor1( PLStream *pls );
void SetExternalBuffer( void* buffer );
-#ifdef HAVE_FREETYPE
+#ifdef PL_HAVE_FREETYPE
void PutPixel( short x, short y, PLINT color );
void PutPixel( short x, short y );
PLINT GetPixel( short x, short y );
-#endif // HAVE_FREETYPE
+#endif // PL_HAVE_FREETYPE
void ProcessString( PLStream* pls, EscText* args );
void PSDrawTextToDC( char* utf8_string, bool drawText );
void PSSetFont( PLUNICODE fci );
@@ -324,11 +324,11 @@
void SetColor0( PLStream *pls );
void SetColor1( PLStream *pls );
void SetExternalBuffer( void* buffer );
-#ifdef HAVE_FREETYPE
+#ifdef PL_HAVE_FREETYPE
void PutPixel( short x, short y, PLINT color );
void PutPixel( short x, short y );
PLINT GetPixel( short x, short y );
-#endif // HAVE_FREETYPE
+#endif // PL_HAVE_FREETYPE
void ProcessString( PLStream* pls, EscText* args );
void PSDrawTextToDC( char* utf8_string, bool drawText );
void PSSetFont( PLUNICODE fci );
Modified: trunk/drivers/wxwidgets_agg.cpp
===================================================================
--- trunk/drivers/wxwidgets_agg.cpp 2013-05-04 16:35:59 UTC (rev 12333)
+++ trunk/drivers/wxwidgets_agg.cpp 2013-05-04 16:43:33 UTC (rev 12334)
@@ -442,7 +442,7 @@
}
-#ifdef HAVE_FREETYPE
+#ifdef PL_HAVE_FREETYPE
//--------------------------------------------------------------------------
// void wxPLDevAGG::PutPixel( short x, short y, PLINT color )
@@ -478,7 +478,7 @@
return RGB( mBuffer->GetRed( x, y ), mBuffer->GetGreen( x, y ), mBuffer->GetBlue( x, y ) );
}
-#endif // HAVE_FREETYPE
+#endif // PL_HAVE_FREETYPE
void wxPLDevAGG::PSDrawTextToDC( char* utf8_string, bool drawText )
Modified: trunk/drivers/wxwidgets_dc.cpp
===================================================================
--- trunk/drivers/wxwidgets_dc.cpp 2013-05-04 16:35:59 UTC (rev 12333)
+++ trunk/drivers/wxwidgets_dc.cpp 2013-05-04 16:43:33 UTC (rev 12334)
@@ -272,7 +272,7 @@
}
-#ifdef HAVE_FREETYPE
+#ifdef PL_HAVE_FREETYPE
//--------------------------------------------------------------------------
// void wxPLDevDC::PutPixel( short x, short y, PLINT color )
@@ -323,7 +323,7 @@
#endif
}
-#endif // HAVE_FREETYPE
+#endif // PL_HAVE_FREETYPE
//--------------------------------------------------------------------------
Modified: trunk/drivers/wxwidgets_gc.cpp
===================================================================
--- trunk/drivers/wxwidgets_gc.cpp 2013-05-04 16:35:59 UTC (rev 12333)
+++ trunk/drivers/wxwidgets_gc.cpp 2013-05-04 16:43:33 UTC (rev 12334)
@@ -321,7 +321,7 @@
}
-#ifdef HAVE_FREETYPE
+#ifdef PL_HAVE_FREETYPE
void wxPLDevGC::PutPixel( short x, short y, PLINT color )
{
@@ -363,7 +363,7 @@
#endif
}
-#endif // HAVE_FREETYPE
+#endif // PL_HAVE_FREETYPE
void wxPLDevGC::PSDrawTextToDC( char* utf8_string, bool drawText )
Modified: trunk/include/plfreetype.h
===================================================================
--- trunk/include/plfreetype.h 2013-05-04 16:35:59 UTC (rev 12333)
+++ trunk/include/plfreetype.h 2013-05-04 16:43:33 UTC (rev 12334)
@@ -28,7 +28,7 @@
#ifndef __PLFREETY_H__
#define __PLFREETY_H__
-#ifdef HAVE_FREETYPE
+#ifdef PL_HAVE_FREETYPE
#include <ft2build.h>
#include FT_FREETYPE_H
Modified: trunk/include/plplotP.h
===================================================================
--- trunk/include/plplotP.h 2013-05-04 16:35:59 UTC (rev 12333)
+++ trunk/include/plplotP.h 2013-05-04 16:43:33 UTC (rev 12334)
@@ -1208,7 +1208,7 @@
plGetDrvDir( void );
#endif
-#ifdef HAVE_FREETYPE
+#ifdef PL_HAVE_FREETYPE
PLDLLIMPEXP void
plD_FreeType_init( PLStream * );
Modified: trunk/src/plfreetype.c
===================================================================
--- trunk/src/plfreetype.c 2013-05-04 16:35:59 UTC (rev 12333)
+++ trunk/src/plfreetype.c 2013-05-04 16:43:33 UTC (rev 12334)
@@ -91,7 +91,7 @@
#include "plDevs.h"
#include "plplotP.h"
#include "drivers.h"
-#ifdef HAVE_FREETYPE
+#ifdef PL_HAVE_FREETYPE
#include "plfreetype.h"
#include "plfci-truetype.h"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
