Revision: 7072 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7072&view=rev Author: mdboom Date: 2009年04月30日 13:27:04 +0000 (2009年4月30日) Log Message: ----------- Fix solaris builds where "putchar" is a macro. Modified Paths: -------------- branches/v0_98_5_maint/ttconv/pprdrv.h branches/v0_98_5_maint/ttconv/pprdrv_tt.cpp branches/v0_98_5_maint/ttconv/pprdrv_tt2.cpp branches/v0_98_5_maint/ttconv/ttutil.cpp Modified: branches/v0_98_5_maint/ttconv/pprdrv.h =================================================================== --- branches/v0_98_5_maint/ttconv/pprdrv.h 2009年04月29日 19:38:35 UTC (rev 7071) +++ branches/v0_98_5_maint/ttconv/pprdrv.h 2009年04月30日 13:27:04 UTC (rev 7072) @@ -40,7 +40,7 @@ virtual void write(const char*) = 0; virtual void printf(const char* format, ...); - virtual void putchar(int val); + virtual void put_char(int val); virtual void puts(const char* a); virtual void putline(const char* a); }; Modified: branches/v0_98_5_maint/ttconv/pprdrv_tt.cpp =================================================================== --- branches/v0_98_5_maint/ttconv/pprdrv_tt.cpp 2009年04月29日 19:38:35 UTC (rev 7071) +++ branches/v0_98_5_maint/ttconv/pprdrv_tt.cpp 2009年04月30日 13:27:04 UTC (rev 7072) @@ -482,20 +482,20 @@ if(!in_string) { - stream.putchar('<'); + stream.put_char('<'); string_len=0; line_len++; in_string=TRUE; } - stream.putchar( hexdigits[ n / 16 ] ); - stream.putchar( hexdigits[ n % 16 ] ); + stream.put_char( hexdigits[ n / 16 ] ); + stream.put_char( hexdigits[ n % 16 ] ); string_len++; line_len+=2; if(line_len > 70) { - stream.putchar('\n'); + stream.put_char('\n'); line_len=0; } @@ -548,7 +548,7 @@ #endif sfnts_pputBYTE(stream, 0); /* extra byte for pre-2013 compatibility */ - stream.putchar('>'); + stream.put_char('>'); line_len++; } in_string=FALSE; @@ -955,7 +955,7 @@ /* a BuildGlyph and BuildChar proceedures. */ if( font->target_type == PS_TYPE_3 ) { - stream.putchar('\n'); + stream.put_char('\n'); stream.putline("/BuildGlyph"); stream.putline(" {exch begin"); /* start font dictionary */ @@ -964,7 +964,7 @@ stream.putline(" true 3 1 roll get exec"); stream.putline(" end}_d"); - stream.putchar('\n'); + stream.put_char('\n'); /* This proceedure is for compatiblity with */ /* level 1 interpreters. */ @@ -973,7 +973,7 @@ stream.putline(" 1 index /BuildGlyph get exec"); stream.putline("}_d"); - stream.putchar('\n'); + stream.put_char('\n'); } /* If we are generating a type 42 font, we need to check to see */ @@ -985,7 +985,7 @@ /* setup instructions and part of BuildGlyph came from. */ else if( font->target_type == PS_TYPE_42 ) { - stream.putchar('\n'); + stream.put_char('\n'); /* If we have no "resourcestatus" command, or FontType 42 */ /* is unknown, leave "true" on the stack. */ @@ -1066,7 +1066,7 @@ /* if the printer has no built-in TrueType */ /* rasterizer. */ stream.putline("}if"); - stream.putchar('\n'); + stream.put_char('\n'); } /* end of if Type 42 not understood. */ stream.putline("FontName currentdict end definefont pop"); Modified: branches/v0_98_5_maint/ttconv/pprdrv_tt2.cpp =================================================================== --- branches/v0_98_5_maint/ttconv/pprdrv_tt2.cpp 2009年04月29日 19:38:35 UTC (rev 7071) +++ branches/v0_98_5_maint/ttconv/pprdrv_tt2.cpp 2009年04月30日 13:27:04 UTC (rev 7072) @@ -104,7 +104,7 @@ { /* have a log of points. */ if(stack_depth == 0) { - stream.putchar('{'); + stream.put_char('{'); stack_depth=1; } Modified: branches/v0_98_5_maint/ttconv/ttutil.cpp =================================================================== --- branches/v0_98_5_maint/ttconv/ttutil.cpp 2009年04月29日 19:38:35 UTC (rev 7071) +++ branches/v0_98_5_maint/ttconv/ttutil.cpp 2009年04月30日 13:27:04 UTC (rev 7072) @@ -52,7 +52,7 @@ va_end(arg_list); } -void TTStreamWriter::putchar(int val) +void TTStreamWriter::put_char(int val) { char c[2]; c[0] = (char)val; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.