[paragui-cvs] CVS: paragui/src/font facecache.h,1.1.1.1,1.1.1.1.2.1 pgfont.cpp,1.3.2.2,1.3.2.3

[Teunis Peters <address@hidden>]

Update of /cvsroot/paragui/paragui/src/font
In directory subversions:/tmp/cvs-serv4328/src/font

Modified Files:
      Tag: devel-opengl
        facecache.h pgfont.cpp 
Log Message:
massive changes - updates from main trunk and various bugfixes


Index: facecache.h
===================================================================
RCS file: /cvsroot/paragui/paragui/src/font/facecache.h,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -C2 -r1.1.1.1 -r1.1.1.1.2.1
*** facecache.h 15 Apr 2002 13:22:11 -0000      1.1.1.1
--- facecache.h 31 Aug 2002 04:01:23 -0000      1.1.1.1.2.1
***************
*** 30,34 ****
  };
  
! typedef STL_MAP<int, PG_GlyphCacheItem*> PG_GlyphCache;
  
  class PG_FontFaceCacheItem {
--- 30,34 ----
  };
  
! typedef std::map<int, PG_GlyphCacheItem*> PG_GlyphCache;
  
  class PG_FontFaceCacheItem {

Index: pgfont.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/src/font/pgfont.cpp,v
retrieving revision 1.3.2.2
retrieving revision 1.3.2.3
diff -C2 -r1.3.2.2 -r1.3.2.3
*** pgfont.cpp  20 Jun 2002 07:05:00 -0000      1.3.2.2
--- pgfont.cpp  31 Aug 2002 04:01:23 -0000      1.3.2.3
***************
*** 489,492 ****
--- 489,494 ----
        FT_Face Face = FaceCache->Face;
        FT_Vector  delta;
+       
+       Surface->Lock();
  
        //Go thu text and draw characters
***************
*** 554,557 ****
--- 556,561 ----
                bRecursion = false;
        }
+ 
+       Surface->Unlock();
  
        return true;