2193a2194,2201
> 
> 
> /*
>  * The `POPPLER_NEW_GFXFONT' stuff is for the change to GfxFont's getNextChar() call.
>  * Thanks to tsdgeos for the fix.
>  * Miklos, does this look ok?
>  */   
> 
2198a2207,2209
> #ifdef POPPLER_NEW_GFXFONT
>   Unicode *u = NULL;
> #else
2199a2211
> #endif
2246a2259,2261
> #ifdef POPPLER_NEW_GFXFONT
> 			    &u, &uLen,  /* TODO: This looks like a memory leak for u. */
> #else
2247a2263
> #endif
2295a2312,2314
> #ifdef POPPLER_NEW_GFXFONT
> 			    &u, &uLen,  /* TODO: This looks like a memory leak for u. */
> #else
2296a2316
> #endif
2327a2348
>