[paragui-cvs] CVS: paragui/src/font facecache.h,1.1.1.1,1.2 pgfont.cpp,1.3,1.4

[Alexander Pipelka <address@hidden>]

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

Modified Files:
        facecache.h pgfont.cpp 
Log Message:
synced with the devel-1-0-x tree.



Index: facecache.h
===================================================================
RCS file: /cvsroot/paragui/paragui/src/font/facecache.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** facecache.h 15 Apr 2002 13:22:11 -0000      1.1.1.1
--- facecache.h 18 Aug 2002 08:12:52 -0000      1.2
***************
*** 1,2 ****
--- 1,3 ----
+ #include "paragui.h"
  #include "pgdatacontainer.h"
  
***************
*** 30,34 ****
  };
  
! typedef STL_MAP<int, PG_GlyphCacheItem*> PG_GlyphCache;
  
  class PG_FontFaceCacheItem {
--- 31,35 ----
  };
  
! 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
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** pgfont.cpp  15 Apr 2002 13:35:35 -0000      1.3
--- pgfont.cpp  18 Aug 2002 08:12:52 -0000      1.4
***************
*** 146,150 ****
        Uint32 src_pitch = Bitmap->pitch;
        register Uint8* src_pixels = Bitmap->buffer + x0 + y0*Bitmap->pitch;
!       register Uint8* dst_pixels = (Uint8*)pixels + (PosX+x0)*bpp + 
(PosY+y0)*pitch;
        Uint8* line;
  
--- 146,150 ----
        Uint32 src_pitch = Bitmap->pitch;
        register Uint8* src_pixels = Bitmap->buffer + x0 + y0*Bitmap->pitch;
!       register Uint8* dst_pixels = (Uint8*)pixels + (PosX+x0)*bpp + 
(PosY+y0)*pitch /*+ Surface->offset*/;
        Uint8* line;
  
***************
*** 487,490 ****
--- 487,494 ----
        FT_Vector  delta;
  
+       if(SDL_MUSTLOCK(Surface)) {
+               SDL_LockSurface(Surface);
+       }               
+ 
        //Go thu text and draw characters
        for (unsigned char *c = (unsigned char*) Text;*c != 0; c++) {
***************
*** 553,556 ****
--- 557,564 ----
        }
  
+       if(SDL_MUSTLOCK(Surface)) {
+               SDL_UnlockSurface(Surface);
+       }               
+       
        return true;
  }