Android: added chaching

Next: add other font related calls, add clipping, 
      add font paths for package resources

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12766 ea41ed52-d2ee-0310-a9c1-e6b18d33e121

1 files changed, 7 insertions, 1 deletions

diff --git a/src/drivers/Android/Fl_Android_Graphics_Font.H b/src/drivers/Android/Fl_Android_Graphics_Font.H
index 7e8af7d52..788119045 100644
--- a/src/drivers/Android/Fl_Android_Graphics_Font.H
+++ b/src/drivers/Android/Fl_Android_Graphics_Font.H
@@ -21,6 +21,10 @@
 
 
 #include "Fl_Android_Graphics_Driver.H"
+
+// We violate FLTKs avoidance of STL because we live in a defined driver space
+#include <map>
+
 #include "stb_truetype.h"
 
 
@@ -35,7 +39,7 @@ public:
   ~Fl_Android_Bytemap();
 
 public:
-  int pWidth, pHeight, pStride, pXOffset, pYOffset;
+  int pWidth, pHeight, pStride, pXOffset, pYOffset, pAdvance;
   unsigned char *pBytes;
 };
 
@@ -69,9 +73,11 @@ class Fl_Android_Font_Descriptor : public Fl_Font_Descriptor
 private:
   Fl_Android_Font_Source *pFontSource;
   Fl_Font pFontIndex;
+  std::map<uint32_t, Fl_Android_Bytemap*> pBytemapTable;
 
 public:
   Fl_Android_Font_Descriptor(const char *fname, Fl_Android_Font_Source *fsrc, Fl_Font fnum, Fl_Fontsize size);
+  ~Fl_Android_Font_Descriptor();
   float get_advance(uint32_t c);
   Fl_Android_Bytemap *get_bytemap(uint32_t c);
   Fl_Android_Font_Source *get_font_source() { return pFontSource; }