ENH: Marking const char * what should be const char *. TODO need to fix code for...

diff --git a/codec/convert.c b/codec/convert.c
index d72f437787a88eb8cf24a625114abf5a69632886..94c2e6a48f96e3760e851bce1aa53b3333292ca9 100644 (file)
--- a/codec/convert.c
+++ b/codec/convert.c
@@ -97,7 +97,7 @@ typedef struct {
   DWORD biClrImportant;                /* Number of important color (0: ALL) */
 } BITMAPINFOHEADER_t;
 
-opj_image_t* bmptoimage(char *filename, opj_cparameters_t *parameters) {
+opj_image_t* bmptoimage(const char *filename, opj_cparameters_t *parameters) {
        int subsampling_dx = parameters->subsampling_dx;
        int subsampling_dy = parameters->subsampling_dy;
 
@@ -460,7 +460,7 @@ opj_image_t* bmptoimage(char *filename, opj_cparameters_t *parameters) {
  return image;
 }
 
-int imagetobmp(opj_image_t * image, char *outfile) {
+int imagetobmp(opj_image_t * image, const char *outfile) {
        int w, wr, h, hr;
        int i, pad;
        FILE *fdest = NULL;
@@ -656,7 +656,7 @@ unsigned int readuint(FILE * f, int bigendian)
     return (c4 << 24) + (c3 << 16) + (c2 << 8) + c1;
 }
 
-opj_image_t* pgxtoimage(char *filename, opj_cparameters_t *parameters) {
+opj_image_t* pgxtoimage(const char *filename, opj_cparameters_t *parameters) {
        FILE *f = NULL;
        int w, h, prec;
        int i, numcomps, max;
@@ -833,7 +833,7 @@ PNM IMAGE FORMAT
 
 <<-- <<-- <<-- <<-- */
 
-opj_image_t* pnmtoimage(char *filename, opj_cparameters_t *parameters) {
+opj_image_t* pnmtoimage(const char *filename, opj_cparameters_t *parameters) {
        int subsampling_dx = parameters->subsampling_dx;
        int subsampling_dy = parameters->subsampling_dy;
 
@@ -932,13 +932,13 @@ opj_image_t* pnmtoimage(char *filename, opj_cparameters_t *parameters) {
        return image;
 }
 
-int imagetopnm(opj_image_t * image, char *outfile) {
+int imagetopnm(opj_image_t * image, const char *outfile) {
        int w, wr, wrr, h, hr, hrr, max;
        int i, compno;
        int adjust;
        FILE *fdest = NULL;
        char S2;
-       char *tmp = outfile;
+       const char *tmp = outfile;
 
        while (*tmp) {
                tmp++;

diff --git a/codec/convert.h b/codec/convert.h
index a3876547926556b9340194923739110c1b7907bf..47690df14368db7d05a4740b27f5e3d6c82862a6 100644 (file)
--- a/codec/convert.h
+++ b/codec/convert.h
@@ -30,9 +30,9 @@
 #ifndef __J2K_CONVERT_H
 #define __J2K_CONVERT_H
 
-opj_image_t* bmptoimage(char *filename, opj_cparameters_t *parameters);
+opj_image_t* bmptoimage(const char *filename, opj_cparameters_t *parameters);
 
-int imagetobmp(opj_image_t *image, char *outfile);
+int imagetobmp(opj_image_t *image, const char *outfile);
 
 /**
 Load a single image component encoded in PGX file format
@@ -40,13 +40,13 @@ Load a single image component encoded in PGX file format
 @param parameters *List ?*
 @return Returns a greyscale image if successful, returns NULL otherwise
 */
-opj_image_t* pgxtoimage(char *filename, opj_cparameters_t *parameters);
+opj_image_t* pgxtoimage(const char *filename, opj_cparameters_t *parameters);
 
-int imagetopgx(opj_image_t *image, char *outfile);
+int imagetopgx(opj_image_t *image, const char *outfile);
 
-opj_image_t* pnmtoimage(char *filename, opj_cparameters_t *parameters);
+opj_image_t* pnmtoimage(const char *filename, opj_cparameters_t *parameters);
 
-int imagetopnm(opj_image_t *image, char *outfile);
+int imagetopnm(opj_image_t *image, const char *outfile);
 
 #endif /* __J2K_CONVERT_H */