1 diff -Naur --exclude=CVS ParaView-3.10.1_SRC_orig/VTK/Rendering/vtkFreeTypeTools.cxx ParaView-3.10.1_SRC_patched/VTK/Rendering/vtkFreeTypeTools.cxx
2 --- ParaView-3.10.1_SRC_orig/VTK/Rendering/vtkFreeTypeTools.cxx 2011-04-13 20:17:26.000000000 +0400
3 +++ ParaView-3.10.1_SRC_patched/VTK/Rendering/vtkFreeTypeTools.cxx 2011-10-07 10:27:34.000000000 +0400
6 #include "fonts/vtkEmbeddedFonts.h"
8 +#ifdef FTGL_USE_NAMESPACE
13 #define VTK_FTFC_DEBUG 0
14 #define VTK_FTFC_DEBUG_CD 0
15 diff -Naur --exclude=CVS ParaView-3.10.1_SRC_orig/VTK/Rendering/vtkFreeTypeUtilities.cxx ParaView-3.10.1_SRC_patched/VTK/Rendering/vtkFreeTypeUtilities.cxx
16 --- ParaView-3.10.1_SRC_orig/VTK/Rendering/vtkFreeTypeUtilities.cxx 2011-04-13 20:17:26.000000000 +0400
17 +++ ParaView-3.10.1_SRC_patched/VTK/Rendering/vtkFreeTypeUtilities.cxx 2011-10-07 10:20:19.000000000 +0400
22 +#ifdef FTGL_USE_NAMESPACE
23 +using namespace ftgl;
28 #define VTK_FTFC_DEBUG 0
29 diff -Naur --exclude=CVS ParaView-3.10.1_SRC_orig/VTK/Rendering/vtkFreeTypeUtilities.h ParaView-3.10.1_SRC_patched/VTK/Rendering/vtkFreeTypeUtilities.h
30 --- ParaView-3.10.1_SRC_orig/VTK/Rendering/vtkFreeTypeUtilities.h 2011-04-13 20:17:26.000000000 +0400
31 +++ ParaView-3.10.1_SRC_patched/VTK/Rendering/vtkFreeTypeUtilities.h 2011-10-07 09:25:07.000000000 +0400
38 #include "vtk_freetype.h" //since ft2build.h could be in the path
39 #include FT_FREETYPE_H
42 # define VTK_FREETYPE_CACHING_SUPPORTED
45 +#ifdef FTGL_USE_NAMESPACE
50 +#ifdef FTGL_USE_NAMESPACE
54 //----------------------------------------------------------------------------
59 vtkTextProperty *TextProperty;
60 +#ifdef FTGL_USE_NAMESPACE
65 float LargestAscender;
66 float LargestDescender;
68 diff -Naur --exclude=CVS ParaView-3.10.1_SRC_orig/VTK/Rendering/vtkOpenGLFreeTypeTextMapper.cxx ParaView-3.10.1_SRC_patched/VTK/Rendering/vtkOpenGLFreeTypeTextMapper.cxx
69 --- ParaView-3.10.1_SRC_orig/VTK/Rendering/vtkOpenGLFreeTypeTextMapper.cxx 2011-04-13 20:17:26.000000000 +0400
70 +++ ParaView-3.10.1_SRC_patched/VTK/Rendering/vtkOpenGLFreeTypeTextMapper.cxx 2011-10-07 10:35:15.000000000 +0400
72 #include "vtk_gl2ps.h"
73 #endif // VTK_USE_GL2PS
75 +#ifdef FTGL_USE_NAMESPACE
76 +using namespace ftgl;
79 //----------------------------------------------------------------------------
81 diff -Naur --exclude=CVS ParaView-3.10.1_SRC_orig/VTK/Rendering/vtkOpenGLFreeTypeTextMapper.h ParaView-3.10.1_SRC_patched/VTK/Rendering/vtkOpenGLFreeTypeTextMapper.h
82 --- ParaView-3.10.1_SRC_orig/VTK/Rendering/vtkOpenGLFreeTypeTextMapper.h 2011-04-13 20:17:26.000000000 +0400
83 +++ ParaView-3.10.1_SRC_patched/VTK/Rendering/vtkOpenGLFreeTypeTextMapper.h 2011-10-07 11:17:46.000000000 +0400
86 #include "vtkTextMapper.h"
90 +//#ifdef FTGL_USE_NAMESPACE
98 +//#ifdef FTGL_USE_NAMESPACE
102 class VTK_RENDERING_EXPORT vtkOpenGLFreeTypeTextMapper : public vtkTextMapper
104 diff -Naur --exclude=CVS ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTBitmapGlyph.cpp ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTBitmapGlyph.cpp
105 --- ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTBitmapGlyph.cpp 2011-04-13 20:17:27.000000000 +0400
106 +++ ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTBitmapGlyph.cpp 2011-10-06 20:28:22.000000000 +0400
111 +#ifdef FTGL_USE_NAMESPACE
116 FTBitmapGlyph::FTBitmapGlyph( FT_Glyph _glyph)
123 +#ifdef FTGL_USE_NAMESPACE
126 diff -Naur --exclude=CVS ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTBitmapGlyph.h ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTBitmapGlyph.h
127 --- ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTBitmapGlyph.h 2011-04-13 20:17:27.000000000 +0400
128 +++ ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTBitmapGlyph.h 2011-10-06 20:28:50.000000000 +0400
133 +#ifdef FTGL_USE_NAMESPACE
139 * FTBitmapGlyph is a specialisation of FTGlyph for creating bitmaps.
144 +#ifdef FTGL_USE_NAMESPACE
148 #endif // __FTBitmapGlyph__
150 diff -Naur --exclude=CVS ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTBitmapGlyphRenderOpenGL.cpp ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTBitmapGlyphRenderOpenGL.cpp
151 --- ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTBitmapGlyphRenderOpenGL.cpp 2011-04-13 20:17:27.000000000 +0400
152 +++ ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTBitmapGlyphRenderOpenGL.cpp 2011-10-06 20:52:10.000000000 +0400
154 #define RenderFunctionName RenderOpenGL
157 +#ifdef FTGL_USE_NAMESPACE
162 void FTBitmapGlyph::RenderFunctionName(const FT_Vector& pen,
163 const FTGLRenderContext *)
166 // Restore the glyph origin
167 glBitmap( 0, 0, 0.0, 0.0, (float)(-pen.x - pos.x), (float)(-pen.y + pos.y), (const GLubyte *)0 );
170 +#ifdef FTGL_USE_NAMESPACE
173 diff -Naur --exclude=CVS ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTCharmap.cpp ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTCharmap.cpp
174 --- ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTCharmap.cpp 2011-04-13 20:17:27.000000000 +0400
175 +++ ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTCharmap.cpp 2011-10-06 20:29:58.000000000 +0400
180 +#ifdef FTGL_USE_NAMESPACE
185 FTCharmap::FTCharmap( FT_Face face)
192 +#ifdef FTGL_USE_NAMESPACE
195 diff -Naur --exclude=CVS ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTCharmap.h ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTCharmap.h
196 --- ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTCharmap.h 2011-04-13 20:17:27.000000000 +0400
197 +++ ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTCharmap.h 2011-10-06 20:29:38.000000000 +0400
202 +#ifdef FTGL_USE_NAMESPACE
208 * FTCharmap takes care of specifying the encoding for a font and mapping
209 * character codes to glyph indices.
214 +#ifdef FTGL_USE_NAMESPACE
218 #endif // __FTCharmap__
219 diff -Naur --exclude=CVS ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTExtrdGlyph.cpp ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTExtrdGlyph.cpp
220 --- ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTExtrdGlyph.cpp 2011-04-13 20:17:27.000000000 +0400
221 +++ ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTExtrdGlyph.cpp 2011-10-06 20:30:45.000000000 +0400
226 +#ifdef FTGL_USE_NAMESPACE
231 FTExtrdGlyph::FTExtrdGlyph( FT_Glyph glyph, float d)
238 +#ifdef FTGL_USE_NAMESPACE
241 diff -Naur --exclude=CVS ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTExtrdGlyph.h ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTExtrdGlyph.h
242 --- ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTExtrdGlyph.h 2011-04-13 20:17:27.000000000 +0400
243 +++ ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTExtrdGlyph.h 2011-10-06 20:30:29.000000000 +0400
248 +#ifdef FTGL_USE_NAMESPACE
260 +#ifdef FTGL_USE_NAMESPACE
264 #endif // __FTExtrdGlyph__
266 diff -Naur --exclude=CVS ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTFace.cpp ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTFace.cpp
267 --- ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTFace.cpp 2011-04-13 20:17:27.000000000 +0400
268 +++ ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTFace.cpp 2011-10-06 20:31:28.000000000 +0400
273 +#ifdef FTGL_USE_NAMESPACE
286 +#ifdef FTGL_USE_NAMESPACE
289 diff -Naur --exclude=CVS ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTFace.h ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTFace.h
290 --- ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTFace.h 2011-04-13 20:17:27.000000000 +0400
291 +++ ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTFace.h 2011-10-06 20:31:11.000000000 +0400
296 +#ifdef FTGL_USE_NAMESPACE
308 +#ifdef FTGL_USE_NAMESPACE
313 diff -Naur --exclude=CVS ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTFont.cpp ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTFont.cpp
314 --- ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTFont.cpp 2011-04-13 20:17:27.000000000 +0400
315 +++ ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTFont.cpp 2011-10-06 20:32:15.000000000 +0400
320 +#ifdef FTGL_USE_NAMESPACE
328 pen.y += kernAdvance.y;
331 +#ifdef FTGL_USE_NAMESPACE
334 diff -Naur --exclude=CVS ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTFont.h ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTFont.h
335 --- ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTFont.h 2011-04-13 20:17:27.000000000 +0400
336 +++ ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTFont.h 2011-10-06 20:32:19.000000000 +0400
341 +#ifdef FTGL_USE_NAMESPACE
346 class FTGlyphContainer;
353 +#ifdef FTGL_USE_NAMESPACE
359 diff -Naur --exclude=CVS ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTGL.h ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTGL.h
360 --- ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTGL.h 2011-04-13 20:17:27.000000000 +0400
361 +++ ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTGL.h 2011-10-06 20:51:26.000000000 +0400
363 #include "vtkftglConfig.h"
366 +#define FTGL_USE_NAMESPACE
368 // To include debug memory manager by Paul Nettle (midnight@FluidStudios.com)
369 // http://www.FluidStudios.com/publications.html
370 // Get this code and use it. It will open your eyes:)
371 diff -Naur --exclude=CVS ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTGLBitmapFont.cpp ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTGLBitmapFont.cpp
372 --- ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTGLBitmapFont.cpp 2011-04-13 20:17:27.000000000 +0400
373 +++ ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTGLBitmapFont.cpp 2011-10-06 20:47:00.000000000 +0400
378 +#ifdef FTGL_USE_NAMESPACE
383 FTGLBitmapFont::FTGLBitmapFont()
386 this->RenderOpenGL(string, context);
390 +#ifdef FTGL_USE_NAMESPACE
393 diff -Naur --exclude=CVS ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTGLBitmapFont.h ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTGLBitmapFont.h
394 --- ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTGLBitmapFont.h 2011-04-13 20:17:27.000000000 +0400
395 +++ ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTGLBitmapFont.h 2011-10-06 20:33:27.000000000 +0400
400 +#ifdef FTGL_USE_NAMESPACE
412 +#ifdef FTGL_USE_NAMESPACE
416 #endif // __FTGLBitmapFont__
417 diff -Naur --exclude=CVS ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTGLBitmapFontRenderOpenGL.cpp ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTGLBitmapFontRenderOpenGL.cpp
418 --- ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTGLBitmapFontRenderOpenGL.cpp 2011-04-13 20:17:27.000000000 +0400
419 +++ ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTGLBitmapFontRenderOpenGL.cpp 2011-10-06 20:53:28.000000000 +0400
421 #define RenderFunctionName RenderOpenGL
424 +#ifdef FTGL_USE_NAMESPACE
429 void FTGLBitmapFont::RenderFunctionName(const char* string,
430 const FTGLRenderContext *context)
437 +#ifdef FTGL_USE_NAMESPACE
440 diff -Naur --exclude=CVS ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTGLExtrdFont.cpp ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTGLExtrdFont.cpp
441 --- ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTGLExtrdFont.cpp 2011-04-13 20:17:27.000000000 +0400
442 +++ ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTGLExtrdFont.cpp 2011-10-06 20:47:04.000000000 +0400
447 +#ifdef FTGL_USE_NAMESPACE
452 FTGLExtrdFont::FTGLExtrdFont()
459 +#ifdef FTGL_USE_NAMESPACE
462 diff -Naur --exclude=CVS ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTGLExtrdFont.h ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTGLExtrdFont.h
463 --- ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTGLExtrdFont.h 2011-04-13 20:17:27.000000000 +0400
464 +++ ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTGLExtrdFont.h 2011-10-06 20:34:02.000000000 +0400
469 +#ifdef FTGL_USE_NAMESPACE
481 +#ifdef FTGL_USE_NAMESPACE
485 #endif // __FTGLExtrdFont__
487 diff -Naur --exclude=CVS ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTGLOutlineFont.cpp ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTGLOutlineFont.cpp
488 --- ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTGLOutlineFont.cpp 2011-04-13 20:17:27.000000000 +0400
489 +++ ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTGLOutlineFont.cpp 2011-10-06 20:34:27.000000000 +0400
494 +#ifdef FTGL_USE_NAMESPACE
499 FTGLOutlineFont::FTGLOutlineFont()
505 +#ifdef FTGL_USE_NAMESPACE
508 diff -Naur --exclude=CVS ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTGLOutlineFont.h ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTGLOutlineFont.h
509 --- ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTGLOutlineFont.h 2011-04-13 20:17:27.000000000 +0400
510 +++ ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTGLOutlineFont.h 2011-10-06 20:34:31.000000000 +0400
515 +#ifdef FTGL_USE_NAMESPACE
524 virtual FTGlyph* MakeGlyph( unsigned int g);
528 +#ifdef FTGL_USE_NAMESPACE
532 #endif // __FTGLOutlineFont__
533 diff -Naur --exclude=CVS ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTGLPixmapFont.cpp ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTGLPixmapFont.cpp
534 --- ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTGLPixmapFont.cpp 2011-04-13 20:17:27.000000000 +0400
535 +++ ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTGLPixmapFont.cpp 2011-10-06 20:50:30.000000000 +0400
540 +#ifdef FTGL_USE_NAMESPACE
545 FTGLPixmapFont::FTGLPixmapFont()
548 this->RenderOpenGL(string, context);
552 +#ifdef FTGL_USE_NAMESPACE
555 diff -Naur --exclude=CVS ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTGLPixmapFont.h ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTGLPixmapFont.h
556 --- ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTGLPixmapFont.h 2011-04-13 20:17:27.000000000 +0400
557 +++ ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTGLPixmapFont.h 2011-10-06 20:35:05.000000000 +0400
562 +#ifdef FTGL_USE_NAMESPACE
574 +#ifdef FTGL_USE_NAMESPACE
578 #endif // __FTGLPixmapFont__
580 diff -Naur --exclude=CVS ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTGLPixmapFontRenderOpenGL.cpp ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTGLPixmapFontRenderOpenGL.cpp
581 --- ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTGLPixmapFontRenderOpenGL.cpp 2011-04-13 20:17:27.000000000 +0400
582 +++ ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTGLPixmapFontRenderOpenGL.cpp 2011-10-06 20:56:22.000000000 +0400
584 #define RenderFunctionName RenderOpenGL
587 +#ifdef FTGL_USE_NAMESPACE
592 void FTGLPixmapFont::RenderFunctionName(const char* string,
593 const FTGLRenderContext *context)
600 +#ifdef FTGL_USE_NAMESPACE
603 diff -Naur --exclude=CVS ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTGLPolygonFont.cpp ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTGLPolygonFont.cpp
604 --- ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTGLPolygonFont.cpp 2011-04-13 20:17:27.000000000 +0400
605 +++ ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTGLPolygonFont.cpp 2011-10-06 20:35:40.000000000 +0400
610 +#ifdef FTGL_USE_NAMESPACE
615 FTGLPolygonFont::FTGLPolygonFont()
622 +#ifdef FTGL_USE_NAMESPACE
625 diff -Naur --exclude=CVS ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTGLPolygonFont.h ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTGLPolygonFont.h
626 --- ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTGLPolygonFont.h 2011-04-13 20:17:27.000000000 +0400
627 +++ ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTGLPolygonFont.h 2011-10-06 20:35:44.000000000 +0400
632 +#ifdef FTGL_USE_NAMESPACE
644 +#ifdef FTGL_USE_NAMESPACE
648 #endif // __FTGLPolygonFont__
650 diff -Naur --exclude=CVS ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTGLTextureFont.cpp ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTGLTextureFont.cpp
651 --- ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTGLTextureFont.cpp 2011-04-13 20:17:27.000000000 +0400
652 +++ ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTGLTextureFont.cpp 2011-10-06 20:36:08.000000000 +0400
657 +#ifdef FTGL_USE_NAMESPACE
662 inline GLuint NextPowerOf2( GLuint in)
668 +#ifdef FTGL_USE_NAMESPACE
671 diff -Naur --exclude=CVS ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTGLTextureFont.h ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTGLTextureFont.h
672 --- ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTGLTextureFont.h 2011-04-13 20:17:27.000000000 +0400
673 +++ ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTGLTextureFont.h 2011-10-06 20:36:10.000000000 +0400
678 +#ifdef FTGL_USE_NAMESPACE
683 class FTTextureGlyph;
690 +#ifdef FTGL_USE_NAMESPACE
694 #endif // __FTGLTextureFont__
696 diff -Naur --exclude=CVS ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTGlyph.cpp ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTGlyph.cpp
697 --- ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTGlyph.cpp 2011-04-13 20:17:27.000000000 +0400
698 +++ ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTGlyph.cpp 2011-10-06 20:36:53.000000000 +0400
703 +#ifdef FTGL_USE_NAMESPACE
711 FT_Done_Glyph( glyph );
715 +#ifdef FTGL_USE_NAMESPACE
718 diff -Naur --exclude=CVS ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTGlyph.h ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTGlyph.h
719 --- ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTGlyph.h 2011-04-13 20:17:27.000000000 +0400
720 +++ ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTGlyph.h 2011-10-06 20:36:57.000000000 +0400
725 +#ifdef FTGL_USE_NAMESPACE
736 +#ifdef FTGL_USE_NAMESPACE
740 #endif // __FTGlyph__
742 diff -Naur --exclude=CVS ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTGlyphContainer.cpp ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTGlyphContainer.cpp
743 --- ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTGlyphContainer.cpp 2011-04-13 20:17:27.000000000 +0400
744 +++ ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTGlyphContainer.cpp 2011-10-06 20:42:17.000000000 +0400
749 +#ifdef FTGL_USE_NAMESPACE
754 FTGlyphContainer::FTGlyphContainer( FTFace* f, unsigned int g, bool p)
757 // kernAdvance.y = advance.y + kernAdvance.y;
761 +#ifdef FTGL_USE_NAMESPACE
764 diff -Naur --exclude=CVS ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTGlyphContainer.h ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTGlyphContainer.h
765 --- ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTGlyphContainer.h 2011-04-13 20:17:27.000000000 +0400
766 +++ ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTGlyphContainer.h 2011-10-06 20:42:13.000000000 +0400
771 +#ifdef FTGL_USE_NAMESPACE
777 * FTGlyphContainer holds the post processed FTGlyph objects.
783 +#ifdef FTGL_USE_NAMESPACE
787 #endif // __FTGlyphContainer__
788 diff -Naur --exclude=CVS ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTLibrary.cpp ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTLibrary.cpp
789 --- ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTLibrary.cpp 2011-04-13 20:17:27.000000000 +0400
790 +++ ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTLibrary.cpp 2011-10-06 20:42:45.000000000 +0400
793 #include <NoSTL/FTCallbackVector.h>
795 +#ifdef FTGL_USE_NAMESPACE
800 FTLibrary *FTLibrary::Instance = 0;
801 FTLibraryCleanup FTLibrary::Cleanup;
802 FTCallbackVector *FTLibraryCleanup::Dependencies = 0;
808 +#ifdef FTGL_USE_NAMESPACE
811 diff -Naur --exclude=CVS ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTLibrary.h ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTLibrary.h
812 --- ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTLibrary.h 2011-04-13 20:17:27.000000000 +0400
813 +++ ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTLibrary.h 2011-10-06 20:42:54.000000000 +0400
815 #include FT_FREETYPE_H
816 //#include FT_CACHE_H
818 +#ifdef FTGL_USE_NAMESPACE
824 * FTLibrary class is the global accessor for the Freetype library.
826 static FTLibrary* Instance;
829 +#ifdef FTGL_USE_NAMESPACE
833 #endif // __FTLibrary__
834 diff -Naur --exclude=CVS ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTOutlineGlyph.cpp ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTOutlineGlyph.cpp
835 --- ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTOutlineGlyph.cpp 2011-04-13 20:17:27.000000000 +0400
836 +++ ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTOutlineGlyph.cpp 2011-10-06 20:43:27.000000000 +0400
841 +#ifdef FTGL_USE_NAMESPACE
846 FTOutlineGlyph::FTOutlineGlyph( FT_Glyph glyph)
852 +#ifdef FTGL_USE_NAMESPACE
855 diff -Naur --exclude=CVS ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTOutlineGlyph.h ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTOutlineGlyph.h
856 --- ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTOutlineGlyph.h 2011-04-13 20:17:27.000000000 +0400
857 +++ ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTOutlineGlyph.h 2011-10-06 20:43:29.000000000 +0400
863 +#ifdef FTGL_USE_NAMESPACE
871 * FTOutlineGlyph is a specialisation of FTGlyph for creating outlines.
876 +#ifdef FTGL_USE_NAMESPACE
880 #endif // __FTOutlineGlyph__
882 diff -Naur --exclude=CVS ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTPixmapGlyph.cpp ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTPixmapGlyph.cpp
883 --- ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTPixmapGlyph.cpp 2011-04-13 20:17:27.000000000 +0400
884 +++ ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTPixmapGlyph.cpp 2011-10-06 20:43:55.000000000 +0400
889 +#ifdef FTGL_USE_NAMESPACE
894 FTPixmapGlyph::FTPixmapGlyph( FT_Glyph _glyph)
901 +#ifdef FTGL_USE_NAMESPACE
904 diff -Naur --exclude=CVS ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTPixmapGlyph.h ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTPixmapGlyph.h
905 --- ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTPixmapGlyph.h 2011-04-13 20:17:27.000000000 +0400
906 +++ ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTPixmapGlyph.h 2011-10-06 20:43:51.000000000 +0400
911 +#ifdef FTGL_USE_NAMESPACE
917 * FTPixmapGlyph is a specialisation of FTGlyph for creating pixmaps.
922 +#ifdef FTGL_USE_NAMESPACE
926 #endif // __FTPixmapGlyph__
927 diff -Naur --exclude=CVS ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTPixmapGlyphRenderOpenGL.cpp ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTPixmapGlyphRenderOpenGL.cpp
928 --- ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTPixmapGlyphRenderOpenGL.cpp 2011-04-13 20:17:27.000000000 +0400
929 +++ ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTPixmapGlyphRenderOpenGL.cpp 2011-10-06 20:58:01.000000000 +0400
931 #define GetCurrentColorFunctionName GetCurrentColorOpenGL
934 +#ifdef FTGL_USE_NAMESPACE
939 void FTPixmapGlyph::GetCurrentColorFunctionName(float colour[4],
940 const FTGLRenderContext *)
943 // Restore the glyph origin
944 glBitmap( 0, 0, 0.0, 0.0, (float)(-pen.x - pos.x), (float)(-pen.y + pos.y), (const GLubyte *)0);
947 +#ifdef FTGL_USE_NAMESPACE
950 diff -Naur --exclude=CVS ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTPolyGlyph.cpp ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTPolyGlyph.cpp
951 --- ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTPolyGlyph.cpp 2011-04-13 20:17:27.000000000 +0400
952 +++ ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTPolyGlyph.cpp 2011-10-06 20:44:20.000000000 +0400
957 +#ifdef FTGL_USE_NAMESPACE
962 FTPolyGlyph::FTPolyGlyph( FT_Glyph glyph)
969 +#ifdef FTGL_USE_NAMESPACE
972 diff -Naur --exclude=CVS ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTPolyGlyph.h ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTPolyGlyph.h
973 --- ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTPolyGlyph.h 2011-04-13 20:17:27.000000000 +0400
974 +++ ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTPolyGlyph.h 2011-10-06 20:44:22.000000000 +0400
979 +#ifdef FTGL_USE_NAMESPACE
991 +#ifdef FTGL_USE_NAMESPACE
995 #endif // __FTPolyGlyph__
997 diff -Naur --exclude=CVS ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTSize.cpp ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTSize.cpp
998 --- ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTSize.cpp 2011-04-13 20:17:27.000000000 +0400
999 +++ ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTSize.cpp 2011-10-06 20:45:03.000000000 +0400
1004 +#ifdef FTGL_USE_NAMESPACE
1016 +#ifdef FTGL_USE_NAMESPACE
1017 +} // namespace ftgl
1019 diff -Naur --exclude=CVS ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTSize.h ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTSize.h
1020 --- ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTSize.h 2011-04-13 20:17:27.000000000 +0400
1021 +++ ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTSize.h 2011-10-06 20:45:06.000000000 +0400
1027 +#ifdef FTGL_USE_NAMESPACE
1033 * FTSize class provides an abstraction layer for the Freetype Size.
1038 +#ifdef FTGL_USE_NAMESPACE
1039 +} // namespace ftgl
1042 #endif // __FTSize__
1044 diff -Naur --exclude=CVS ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTTextureGlyph.cpp ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTTextureGlyph.cpp
1045 --- ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTTextureGlyph.cpp 2011-04-13 20:17:27.000000000 +0400
1046 +++ ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTTextureGlyph.cpp 2011-10-06 20:45:28.000000000 +0400
1051 +#ifdef FTGL_USE_NAMESPACE
1056 FTTextureGlyph::FTTextureGlyph( FT_Glyph glyph, int id, int xOffset, int yOffset, GLsizei width, GLsizei height)
1062 +#ifdef FTGL_USE_NAMESPACE
1063 +} // namespace ftgl
1065 diff -Naur --exclude=CVS ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTTextureGlyph.h ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTTextureGlyph.h
1066 --- ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTTextureGlyph.h 2011-04-13 20:17:27.000000000 +0400
1067 +++ ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTTextureGlyph.h 2011-10-06 20:45:30.000000000 +0400
1070 #include "FTGlyph.h"
1072 +#ifdef FTGL_USE_NAMESPACE
1078 * FTTextureGlyph is a specialisation of FTGlyph for creating texture
1083 +#ifdef FTGL_USE_NAMESPACE
1084 +} // namespace ftgl
1087 #endif // __FTTextureGlyph__
1088 diff -Naur --exclude=CVS ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTVectoriser.cpp ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTVectoriser.cpp
1089 --- ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTVectoriser.cpp 2011-04-13 20:17:27.000000000 +0400
1090 +++ ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTVectoriser.cpp 2011-10-06 20:46:20.000000000 +0400
1093 } // End of extern C
1095 +#ifdef FTGL_USE_NAMESPACE
1100 //=============================================================================
1102 bool operator == ( const ftPoint &a, const ftPoint &b)
1108 +#ifdef FTGL_USE_NAMESPACE
1109 +} // namespace ftgl
1111 diff -Naur --exclude=CVS ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTVectoriser.h ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTVectoriser.h
1112 --- ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/FTVectoriser.h 2011-04-13 20:17:27.000000000 +0400
1113 +++ ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/FTVectoriser.h 2011-10-06 20:45:52.000000000 +0400
1118 +#ifdef FTGL_USE_NAMESPACE
1124 * ftPoint class is a basic 3 dimensional point for holding outline font
1130 +#ifdef FTGL_USE_NAMESPACE
1131 +} // namespace ftgl
1134 #endif // __FTVectoriser__
1135 diff -Naur --exclude=CVS ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/NoSTL/FTCharToGlyphIndexMap.h ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/NoSTL/FTCharToGlyphIndexMap.h
1136 --- ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/NoSTL/FTCharToGlyphIndexMap.h 2011-04-13 20:17:27.000000000 +0400
1137 +++ ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/NoSTL/FTCharToGlyphIndexMap.h 2011-10-06 20:55:06.000000000 +0400
1142 +#ifdef FTGL_USE_NAMESPACE
1147 class FTGL_EXPORT FTCharToGlyphIndexMap
1151 this->Indices[pos.quot][pos.rem] = g;
1154 +#ifdef FTGL_USE_NAMESPACE
1155 +} // namespace ftgl
1158 #endif // __FTCharToGlyphIndexMap__
1159 diff -Naur --exclude=CVS ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/NoSTL/FTVector.h ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/NoSTL/FTVector.h
1160 --- ParaView-3.10.1_SRC_orig/VTK/Utilities/ftgl/src/NoSTL/FTVector.h 2011-04-13 20:17:27.000000000 +0400
1161 +++ ParaView-3.10.1_SRC_patched/VTK/Utilities/ftgl/src/NoSTL/FTVector.h 2011-10-06 20:55:47.000000000 +0400
1166 +#ifdef FTGL_USE_NAMESPACE
1171 class FTGL_EXPORT FT_VECTOR_CLASS_NAME
1179 +#ifdef FTGL_USE_NAMESPACE
1180 +} // namespace ftgl