oops, includes

panda/src/pnmtext/config_pnmtext.cxx

@@ -17,7 +17,6 @@
 ////////////////////////////////////////////////////////////////////
 
 #include "config_pnmtext.h"
-#include "staticTextFont.h"
 
 #include "dconfig.h"
 

panda/src/pnmtext/freetypeFont.h

@@ -23,10 +23,11 @@
 
 #ifdef HAVE_FREETYPE
 
-#include "config_text.h"
+#include "config_pnmtext.h"
 #include "filename.h"
 #include "pvector.h"
 #include "pmap.h"
+#include "pnmImage.h"
 #include "namable.h"
 
 #include <ft2build.h>

panda/src/pnmtext/pnmTextMaker.cxx

@@ -74,7 +74,7 @@ generate_into(const wstring &text, PNMImage &dest_image, int x, int y) {
     width += glyph->get_advance();
   }
 
-  int xp;
+  int xp = x; 
   int yp = y;
 
   switch (_align) {