Fix for the build issues

MapServer · Apr 12, 2012 · b6192fd · b6192fd
1 parent 30a939d
commit b6192fd
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/maplabel.c b/maplabel.c
@@ -997,6 +997,8 @@ int msGetTruetypeTextBBox(rendererVTableObj *renderer, char* fontstring, fontSet
         double size, char *string, rectObj *rect, double **advances, int bAdjustbaseline) {
    outputFormatObj *format = NULL;
    int ret = MS_FAILURE;
+   char *lookedUpFonts[MS_MAX_LABEL_FONTS];
+   int numfonts;
    if(!renderer) {
       outputFormatObj *format = msCreateDefaultOutputFormat(NULL,"AGG/PNG","tmp");
       if(!format) {
@@ -1005,8 +1007,6 @@ int msGetTruetypeTextBBox(rendererVTableObj *renderer, char* fontstring, fontSet
       msInitializeRendererVTable(format);
       renderer = format->vtable;
    }
-   char *lookedUpFonts[MS_MAX_LABEL_FONTS];
-   int numfonts;
    if(MS_FAILURE == msFontsetLookupFonts(fontstring, &numfonts, fontset, lookedUpFonts))
       goto tt_cleanup;
    ret = renderer->getTruetypeTextBBox(renderer,lookedUpFonts,numfonts,size,string,rect,advances,bAdjustbaseline);

diff --git a/nmake.opt b/nmake.opt
@@ -685,7 +685,7 @@ FT_LIB=$(FT_DIR)/objs/win32/vc2008/freetype239.lib
 # GD include and library
 GD_INC= -I$(GD_DIR)
 GD_LIBS= $(GD_LIB) $(JPEG_LIB) $(PNG_LIB) $(FT_LIB)
-GD= $(OUTPUT_PNG) $(OUTPUT_JPEG) $(OUTPUT_WBMP) $(OUTPUT_GIF) $(ANNOTATION_FT) $(GD_HAS_GETBITMAPFONT) $(GD_HAS_FTEX_XSHOW)
+GD= -DUSE_GD $(OUTPUT_PNG) $(OUTPUT_JPEG) $(OUTPUT_WBMP) $(OUTPUT_GIF) $(ANNOTATION_FT) $(GD_HAS_GETBITMAPFONT) $(GD_HAS_FTEX_XSHOW)
 
 # Tiff library on input
 !IFDEF TIFF