Changeset 6504

Timestamp:

Aug 8, 2007, 8:04:02 AM (17 years ago)

Author:

dmorissette

Message:

Fixed problems with very large HTML legends producing no output, use msIO_fwrite() instead of
msIO_printf() to write output (#1946)

Location:

trunk/mapserver

Files:

• HISTORY.TXT (modified) (1 diff)
• mapserv.c (modified) (1 diff)
• maptemplate.c (modified) (2 diffs)

trunk/mapserver/HISTORY.TXT

@@ -14 +14 @@
 ---------------------------
 
+- Fixed problems with very large HTML legends producing no output (#1946)
 
 - Use OGR-specific destructors for objects that have them rather than

trunk/mapserver/mapserv.c

@@ -1344 +1344 @@
           legendTemplate = generateLegendTemplate(msObj);
           if (legendTemplate) {
-             msIO_printf("Content-type: %s%c%c%s", msObj->Map->web.legendformat, 10, 10, legendTemplate);
+             msIO_printf("Content-type: %s%c%c", msObj->Map->web.legendformat, 10, 10);
+             msIO_fwrite(legendTemplate, strlen(legendTemplate), 1, stdout);
+
              free(legendTemplate);
           } else /* error already generated by (generateLegendTemplate()) */

trunk/mapserver/maptemplate.c

@@ -2993 +2993 @@
       }
       else
-          msIO_printf("%s", tmpline);
+          msIO_fwrite(tmpline, strlen(tmpline), 1, stdout);
       free(tmpline);
     } 
@@ -3014 +3014 @@
         }
         else 
-            msIO_printf("%s", line);
+            msIO_fwrite(line, strlen(line), 1, stdout);
     }
     if (!papszBuffer)