Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Bill Lorensen
VTK
Commits
4e394cfe
Commit
4e394cfe
authored
Apr 23, 2012
by
Dave DeMarle
Browse files
Merge branch 'freetype-gcc-4-7' into release
Change-Id: Iad003a0d6fb9b85dd1abccdbd8adb4a7636b55a6
parents
5eb0cf0c
b649c55c
Changes
2
Hide whitespace changes
Inline
Side-by-side
Rendering/vtkFreeTypeTools.cxx
View file @
4e394cfe
...
@@ -31,6 +31,10 @@
...
@@ -31,6 +31,10 @@
// The embedded fonts
// The embedded fonts
#include "fonts/vtkEmbeddedFonts.h"
#include "fonts/vtkEmbeddedFonts.h"
#ifndef _MSC_VER
# include <stdint.h>
#endif
#ifdef FTGL_USE_NAMESPACE
#ifdef FTGL_USE_NAMESPACE
using
namespace
ftgl
;
using
namespace
ftgl
;
#endif
#endif
...
...
Rendering/vtkFreeTypeUtilities.cxx
View file @
4e394cfe
...
@@ -31,6 +31,9 @@
...
@@ -31,6 +31,9 @@
#include "fonts/vtkEmbeddedFonts.h"
#include "fonts/vtkEmbeddedFonts.h"
#include <sys/stat.h>
#include <sys/stat.h>
#ifndef _MSC_VER
# include <stdint.h>
#endif
#ifdef FTGL_USE_NAMESPACE
#ifdef FTGL_USE_NAMESPACE
using
namespace
ftgl
;
using
namespace
ftgl
;
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment