Commit 1bf1ebb967377e1eddb6de3391a0583be76db2bc
2002-12-02T06:31:32
Renamed lib to library. Got rid of the version stuff. Unvirtualised some functions
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107
diff --git a/include/FTLibrary.h b/include/FTLibrary.h
index 0208e82..39f3caa 100755
--- a/include/FTLibrary.h
+++ b/include/FTLibrary.h
@@ -41,21 +41,21 @@ class FTGL_EXPORT FTLibrary
*
* @return A handle to a FreeType library instance.
*/
- FT_Library* GetLibrary() const { return lib;}
+ FT_Library* GetLibrary() const { return library;}
/**
* Queries the library for errors.
*
* @return The current error code.
*/
- virtual FT_Error Error() const { return err;}
+ FT_Error Error() const { return err;}
/**
* Destructor
*
* Disposes of the Freetype library
*/
- virtual ~FTLibrary();
+ ~FTLibrary();
private:
/**
@@ -66,7 +66,7 @@ class FTGL_EXPORT FTLibrary
*/
FTLibrary();
FTLibrary( const FT_Library&){}
- FTLibrary& operator=( const FT_Library&) { return *this; }
+ FTLibrary& operator=( const FT_Library&) { return *this; }
/**
* Initialises the Freetype library
@@ -84,15 +84,10 @@ class FTGL_EXPORT FTLibrary
/**
* Freetype library handle.
*/
- FT_Library* lib;
+ FT_Library* library;
// FTC_Manager* manager;
/**
- * Freetype library version.
- */
- int major, minor, patch;
-
- /**
* Current error code. Zero means no error.
*/
FT_Error err;
diff --git a/src/FTLibrary.cpp b/src/FTLibrary.cpp
index 67cf32f..2bf88f8 100755
--- a/src/FTLibrary.cpp
+++ b/src/FTLibrary.cpp
@@ -10,12 +10,12 @@ FTLibrary& FTLibrary::Instance()
FTLibrary::~FTLibrary()
{
- if( lib != 0)
+ if( library != 0)
{
- FT_Done_FreeType( *lib);
+ FT_Done_FreeType( *library);
- delete lib;
- lib= 0;
+ delete library;
+ library= 0;
}
// if( manager != 0)
@@ -29,7 +29,7 @@ FTLibrary::~FTLibrary()
FTLibrary::FTLibrary()
-: lib(0),
+: library(0),
err(0)
{
Init();
@@ -38,16 +38,16 @@ FTLibrary::FTLibrary()
bool FTLibrary::Init()
{
- if( lib != 0 )
+ if( library != 0)
return true;
- lib = new FT_Library;
+ library = new FT_Library;
- err = FT_Init_FreeType( lib);
+ err = FT_Init_FreeType( library);
if( err)
{
- delete lib;
- lib = 0;
+ delete library;
+ library = 0;
return false;
}