[GRASS-SVN] r31942 - in grass/branches/develbranch_6: include lib/ogsf

[svn_grass at osgeo.org]

Author: neteler
Date: 2008-07-01 17:59:23 -0400 (Tue, 01 Jul 2008)
New Revision: 31942

Modified:
   grass/branches/develbranch_6/include/ogsf_proto.h
   grass/branches/develbranch_6/lib/ogsf/gsd_img_mpeg.c
   grass/branches/develbranch_6/lib/ogsf/gsd_img_ppm.c
   grass/branches/develbranch_6/lib/ogsf/gsd_img_tif.c
Log:
Change char * -> const char * (merge from trunk)

Modified: grass/branches/develbranch_6/include/ogsf_proto.h
===================================================================
--- grass/branches/develbranch_6/include/ogsf_proto.h	2008-07-01 21:54:05 UTC (rev 31941)
+++ grass/branches/develbranch_6/include/ogsf_proto.h	2008-07-01 21:59:23 UTC (rev 31942)
@@ -195,7 +195,7 @@
 double GS_get_aspect(void);
 int GS_has_transparency(void);
 void GS_zoom_setup(int *, int *, int *, int *, int *, int *);
-int GS_write_zoom(char *, unsigned int, unsigned int);
+int GS_write_zoom(const char *, unsigned int, unsigned int);
 void GS_draw_all_list(void);
 void GS_delete_list(GLuint);
 int GS_draw_legend(char *, GLuint, int, int *, float *, int *);
@@ -462,13 +462,13 @@
 int get_txtxoffset();
 
 /* From gsd_img_ppm.c */
-int GS_write_ppm(char *);
-int gsd_init_mpeg(char *);
+int GS_write_ppm(const char *);
+int gsd_init_mpeg(const char *);
 int gsd_write_mpegframe(void);
 int gsd_close_mpeg(void);
 
 /* From gsd_img_tif.c */
-int GS_write_tif(char *);
+int GS_write_tif(const char *);
 
 /* From gsd_label.c */
 void gs_put_label(char *, GLuint , int , unsigned long, int *);

Modified: grass/branches/develbranch_6/lib/ogsf/gsd_img_mpeg.c
===================================================================
--- grass/branches/develbranch_6/lib/ogsf/gsd_img_mpeg.c	2008-07-01 21:54:05 UTC (rev 31941)
+++ grass/branches/develbranch_6/lib/ogsf/gsd_img_mpeg.c	2008-07-01 21:59:23 UTC (rev 31942)
@@ -274,7 +274,7 @@
  \return -1 on failure
  \return 0 on success
 */
-int gsd_init_mpeg(char *filename)
+int gsd_init_mpeg(const char *filename)
 {
 #ifdef HAVE_FFMPEG
 	GLuint l, r, b, t;

Modified: grass/branches/develbranch_6/lib/ogsf/gsd_img_ppm.c
===================================================================
--- grass/branches/develbranch_6/lib/ogsf/gsd_img_ppm.c	2008-07-01 21:54:05 UTC (rev 31941)
+++ grass/branches/develbranch_6/lib/ogsf/gsd_img_ppm.c	2008-07-01 21:59:23 UTC (rev 31942)
@@ -39,7 +39,7 @@
   \return 1 on failure
   \return 0 on success
 */
-int GS_write_ppm(char *name)
+int GS_write_ppm(const char *name)
 {
     unsigned int x;
     int y;
@@ -84,7 +84,7 @@
   \return 1 on failure
   \return 0 on success
 */
-int GS_write_zoom(char *name, unsigned int xsize, unsigned int ysize)
+int GS_write_zoom(const char *name, unsigned int xsize, unsigned int ysize)
 {
     unsigned int x;
     int y;

Modified: grass/branches/develbranch_6/lib/ogsf/gsd_img_tif.c
===================================================================
--- grass/branches/develbranch_6/lib/ogsf/gsd_img_tif.c	2008-07-01 21:54:05 UTC (rev 31941)
+++ grass/branches/develbranch_6/lib/ogsf/gsd_img_tif.c	2008-07-01 21:59:23 UTC (rev 31942)
@@ -34,7 +34,7 @@
 #include <grass/gstypes.h>
 #include <grass/glocale.h>
 
-#include "tiffio.h"
+#include <tiffio.h>
 
 unsigned short config = PLANARCONFIG_CONTIG;
 unsigned short compression = -1;
@@ -48,7 +48,7 @@
   \return 1 on error
   \return 0 on success
 */
-int GS_write_tif(char *name)
+int GS_write_tif(const char *name)
 {
     TIFF *out;
     int y, x;