Merge branch 'branch-6-2'

MapServer · Aug 23, 2012 · 2f4b50a · 2f4b50a
2 parents e632af4 + 5463c8f
commit 2f4b50a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/maperror.c b/maperror.c
@@ -384,6 +384,7 @@ void msWriteErrorImage(mapObj *map, char *filename, int blank)
   int nWidthTxt = 0;
   outputFormatObj *format = NULL;
   char *errormsg = msGetErrorString("; ");
+  errorObj *error = msGetErrorObj();
   fontMetrics *font = NULL;
   char *imagepath = NULL, *imageurl = NULL;
   labelStyleObj ls;
@@ -488,6 +489,12 @@ void msWriteErrorImage(mapObj *map, char *filename, int blank)
   msSaveImage(NULL,img,filename);
   msFreeImage(img);
 
+  /* the errors are reported */
+  while(error && error->code != MS_NOERR) {
+    error->isreported = MS_TRUE;
+    error = error->next;
+  }
+
   if (format->refcount == 0)
     msFreeOutputFormat(format);
   msFree(errormsg);

diff --git a/maptemplate.c b/maptemplate.c
@@ -4479,7 +4479,6 @@ void msFreeMapServObj(mapservObj* mapserv)
     msFree(mapserv->QueryLayer);
     msFree(mapserv->SelectLayer);
     msFree(mapserv->QueryFile);
-    msFree(mapserv->QueryItem);
 
     msFree(mapserv);
   }