OSDN Git Service
(root)
/
psychlops
/
cpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cache
[psychlops/cpp.git]
/
psychlops
/
core
/
graphic
/
psychlops_g_font.cpp
diff --git
a/psychlops/core/graphic/psychlops_g_font.cpp
b/psychlops/core/graphic/psychlops_g_font.cpp
index
d4a75a8
..
e4a3c3c
100644
(file)
--- a/
psychlops/core/graphic/psychlops_g_font.cpp
+++ b/
psychlops/core/graphic/psychlops_g_font.cpp
@@
-78,23
+78,23
@@
namespace Psychlops {
Letters::Cache::Cache(APIFontProperties* id__, bool dirty__) : id(id__), dirty(dirty__) {}
Letters::Letters()
Letters::Cache::Cache(APIFontProperties* id__, bool dirty__) : id(id__), dirty(dirty__) {}
Letters::Letters()
- : str(), font(Font::default_font), width_(0), height_(0), vertical_align(BASELINE)
+ : str(), font(Font::default_font), width_(0), height_(0), vertical_align(BASELINE)
, _zoom_cache(false)
{
}
Letters::Letters(const char *init_str, const Font& init_font)
{
}
Letters::Letters(const char *init_str, const Font& init_font)
- : font(init_font), width_(0), height_(0), vertical_align(BASELINE)
+ : font(init_font), width_(0), height_(0), vertical_align(BASELINE)
, _zoom_cache(false)
{
str = LocalEncodingtoWCHAR(init_str);
cache();
}
Letters::Letters(const char *init_str, int size_, const Font& init_font)
{
str = LocalEncodingtoWCHAR(init_str);
cache();
}
Letters::Letters(const char *init_str, int size_, const Font& init_font)
- : font(init_font), width_(0), height_(0), vertical_align(BASELINE)
+ : font(init_font), width_(0), height_(0), vertical_align(BASELINE)
, _zoom_cache(false)
{
str = LocalEncodingtoWCHAR(init_str, size_);
cache();
}
Letters::Letters(const std::wstring &init_str, const Font& init_font)
{
str = LocalEncodingtoWCHAR(init_str, size_);
cache();
}
Letters::Letters(const std::wstring &init_str, const Font& init_font)
- : str(init_str), font(init_font), width_(0), height_(0), vertical_align(BASELINE)
+ : str(init_str), font(init_font), width_(0), height_(0), vertical_align(BASELINE)
, _zoom_cache(false)
{
cache();
}
{
cache();
}