Browse Source

Fix typo.

aster 11 years ago
parent
commit
ebc9e8cc43

+ 4 - 4
Source/Engine/UI/Font.cpp

@@ -25,7 +25,7 @@
 #include "Deserializer.h"
 #include "FileSystem.h"
 #include "Font.h"
-#include "FontFaceBitMap.h"
+#include "FontFaceBitmap.h"
 #include "FontFaceFreeType.h"
 #include "Graphics.h"
 #include "Profiler.h"
@@ -100,7 +100,7 @@ bool Font::SaveXML(Serializer& dest, int pointSize, bool usedGlyphs)
 
     PROFILE(FontSaveXML);
 
-    SharedPtr<FontFaceBitMap> packedFontFace(new FontFaceBitMap(this));
+    SharedPtr<FontFaceBitmap> packedFontFace(new FontFaceBitmap(this));
     if (!packedFontFace->Load(fontFace, usedGlyphs))
         return false;
 
@@ -164,10 +164,10 @@ FontFace* Font::GetFaceFreeType(int pointSize)
 
 FontFace* Font::GetFaceBitmap(int pointSize)
 {
-    SharedPtr<FontFace> newFace(new FontFaceBitMap(this));
+    SharedPtr<FontFace> newFace(new FontFaceBitmap(this));
     if (!newFace->Load(&fontData_[0], fontDataSize_, pointSize))
         return 0;
-    
+
     faces_[pointSize] = newFace;
     return newFace;
 }

+ 1 - 1
Source/Engine/UI/FontFace.h

@@ -106,7 +106,7 @@ public:
     const Vector<SharedPtr<Texture2D> >& GetTextures() const { return textures_; }
     
 protected:
-    friend class FontFaceBitMap;
+    friend class FontFaceBitmap;
     /// Create a texture for font rendering.
     SharedPtr<Texture2D> CreateFaceTexture();
     /// Load font face texture from image resource.

+ 9 - 9
Source/Engine/UI/FontFaceBitmap.cpp

@@ -25,7 +25,7 @@
 #include "File.h"
 #include "FileSystem.h"
 #include "Font.h"
-#include "FontFaceBitMap.h"
+#include "FontFaceBitmap.h"
 #include "Graphics.h"
 #include "Image.h"
 #include "Log.h"
@@ -40,16 +40,16 @@
 namespace Urho3D
 {
 
-FontFaceBitMap::FontFaceBitMap(Font* font) :
+FontFaceBitmap::FontFaceBitmap(Font* font) :
     FontFace(font)
 {
 }
 
-FontFaceBitMap::~FontFaceBitMap()
+FontFaceBitmap::~FontFaceBitmap()
 {
 }
 
-bool FontFaceBitMap::Load(const unsigned char* fontData, unsigned fontDataSize, int pointSize)
+bool FontFaceBitmap::Load(const unsigned char* fontData, unsigned fontDataSize, int pointSize)
 {
     Context* context = font_->GetContext();
 
@@ -170,7 +170,7 @@ bool FontFaceBitMap::Load(const unsigned char* fontData, unsigned fontDataSize,
     return true;
 }
 
-bool FontFaceBitMap::Load(FontFace* fontFace, bool usedGlyphs)
+bool FontFaceBitmap::Load(FontFace* fontFace, bool usedGlyphs)
 {
     Context* context = font_->GetContext();
     int maxTextureSize = font_->GetSubsystem<UI>()->GetMaxFontTextureSize();
@@ -276,7 +276,7 @@ bool FontFaceBitMap::Load(FontFace* fontFace, bool usedGlyphs)
     return true;
 }
 
-bool FontFaceBitMap::Save(Serializer& dest, int pointSize)
+bool FontFaceBitmap::Save(Serializer& dest, int pointSize)
 {
     Context* context = font_->GetContext();
 
@@ -361,7 +361,7 @@ bool FontFaceBitMap::Save(Serializer& dest, int pointSize)
     return xml->Save(dest);
 }
 
-unsigned FontFaceBitMap::ConvertFormatToNumComponents(unsigned format)
+unsigned FontFaceBitmap::ConvertFormatToNumComponents(unsigned format)
 {
     if (format == Graphics::GetRGBAFormat())
         return 4;
@@ -374,7 +374,7 @@ unsigned FontFaceBitMap::ConvertFormatToNumComponents(unsigned format)
 }
 
 
-SharedPtr<Image> FontFaceBitMap::SaveFaceTexture(Texture2D* texture)
+SharedPtr<Image> FontFaceBitmap::SaveFaceTexture(Texture2D* texture)
 {
     Image* image = new Image(font_->GetContext());
     image->SetSize(texture->GetWidth(), texture->GetHeight(), ConvertFormatToNumComponents(texture->GetFormat()));
@@ -387,7 +387,7 @@ SharedPtr<Image> FontFaceBitMap::SaveFaceTexture(Texture2D* texture)
     return SharedPtr<Image>(image);
 }
 
-bool FontFaceBitMap::SaveFaceTexture(Texture2D* texture, const String& fileName)
+bool FontFaceBitmap::SaveFaceTexture(Texture2D* texture, const String& fileName)
 {
     SharedPtr<Image> image = SaveFaceTexture(texture);
     return image ? image->SavePNG(fileName) : false;

+ 3 - 3
Source/Engine/UI/FontFaceBitmap.h

@@ -31,13 +31,13 @@ class Image;
 class Serializer;
 
 /// Bitmap font face description.
-class URHO3D_API FontFaceBitMap : public FontFace
+class URHO3D_API FontFaceBitmap : public FontFace
 {
 public:
     /// Construct.
-    FontFaceBitMap(Font* font);
+    FontFaceBitmap(Font* font);
     /// Destruct.
-    ~FontFaceBitMap();
+    ~FontFaceBitmap();
 
     /// Load font face.
     virtual bool Load(const unsigned char* fontData, unsigned fontDataSize, int pointSize);