Mercurial > hg > dmlib

changeset 1341:ae2ba8cb510f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Constify.
author Matti Hamalainen <ccr@tnsp.org>
date Tue, 22 Aug 2017 17:15:22 +0300
parents 1f8687c61891
children f2fd1ad84829
files tools/libgfx.c tools/libgfx.h
diffstat 2 files changed, 26 insertions(+), 24 deletions(-) [+]
line wrap: on
line diff
--- a/tools/libgfx.c	Tue Aug 22 16:54:41 2017 +0300
+++ b/tools/libgfx.c	Tue Aug 22 17:15:22 2017 +0300
@@ -199,7 +199,7 @@
 }
 
 
-int dmWriteImageData(DMImage *img, void *cbdata, int (*writeRowCB)(void *, const Uint8 *, const size_t), const DMImageConvSpec *spec)
+int dmWriteImageData(const DMImage *img, void *cbdata, int (*writeRowCB)(void *, const Uint8 *, const size_t), const DMImageConvSpec *spec)
 {
     int x, y, yscale, xscale, res = 0, rowSize, rowWidth;
     Uint8 *row = NULL;
@@ -304,7 +304,8 @@
 
 #define DMCOL(x) (((x) >> 4) & 0xf)
 
-int dmWriteIFFMasterRAWPalette(FILE *fp, DMImage *img, int ncolors,
+int dmWriteIFFMasterRAWPalette(FILE *fp,
+    const DMImage *img, int ncolors,
     const char *indent, const char *type)
 {
     int i;
@@ -331,7 +332,7 @@
 }
 
 
-int dmWriteRAWImageFILE(FILE *fp, DMImage *img, const DMImageConvSpec *spec)
+int dmWriteRAWImageFILE(FILE *fp, const DMImage *img, const DMImageConvSpec *spec)
 {
     int xc, yc, plane, res;
     DMBitStreamContext bs;
@@ -373,7 +374,7 @@
 }
 
 
-int dmWriteRAWImage(const char *filename, DMImage *img, const DMImageConvSpec *spec)
+int dmWriteRAWImage(const char *filename, const DMImage *img, const DMImageConvSpec *spec)
 {
     FILE *fp;
     int res;
@@ -401,7 +402,7 @@
 }
 
 
-int dmWritePPMImageFILE(FILE *fp, DMImage *img, const DMImageConvSpec *spec)
+int dmWritePPMImageFILE(FILE *fp, const DMImage *img, const DMImageConvSpec *spec)
 {
     DMImageConvSpec tmpSpec;
 
@@ -418,7 +419,7 @@
 }
 
 
-int dmWritePPMImage(const char *filename, DMImage *img, const DMImageConvSpec *spec)
+int dmWritePPMImage(const char *filename, const DMImage *img, const DMImageConvSpec *spec)
 {
     FILE *fp;
     int res;
@@ -453,7 +454,7 @@
 }
 
 
-int dmWritePNGImageFILE(FILE *fp, DMImage *img, const DMImageConvSpec *spec)
+int dmWritePNGImageFILE(FILE *fp, const DMImage *img, const DMImageConvSpec *spec)
 {
     png_structp png_ptr = NULL;
     png_infop info_ptr = NULL;
@@ -561,7 +562,7 @@
 }
 
 
-int dmWritePNGImage(const char *filename, DMImage *img, const DMImageConvSpec *spec)
+int dmWritePNGImage(const char *filename, const DMImage *img, const DMImageConvSpec *spec)
 {
     int res;
     FILE *fp;
@@ -899,7 +900,7 @@
 }
 
 
-int dmWritePCXImageFILE(FILE *fp, DMImage *img, const DMImageConvSpec *pspec)
+int dmWritePCXImageFILE(FILE *fp, const DMImage *img, const DMImageConvSpec *pspec)
 {
     DMPCXData pcx;
     DMPCXHeader hdr;
@@ -1055,7 +1056,7 @@
 }
 
 
-int dmWritePCXImage(const char *filename, DMImage *img, const DMImageConvSpec *spec)
+int dmWritePCXImage(const char *filename, const DMImage *img, const DMImageConvSpec *spec)
 {
     FILE *fp;
     int res;
@@ -1933,8 +1934,6 @@
 }
 
 
-
-
 static int fmtProbePNG(const Uint8 *buf, const size_t len)
 {
     if (len > 64 && buf[0] == 0x89 &&
--- a/tools/libgfx.h	Tue Aug 22 16:54:41 2017 +0300
+++ b/tools/libgfx.h	Tue Aug 22 17:15:22 2017 +0300
@@ -79,8 +79,8 @@
     int  (*probe)(const Uint8 *buf, const size_t len);
     int  (*read)(const char *filename, DMImage **pimg);
     int  (*readFILE)(FILE *fp, DMImage **pimg);
-    int  (*write)(const char *filename, DMImage *pimg, const DMImageConvSpec *spec);
-    int  (*writeFILE)(FILE *fp, DMImage *pimg, const DMImageConvSpec *spec);
+    int  (*write)(const char *filename, const DMImage *pimg, const DMImageConvSpec *spec);
+    int  (*writeFILE)(FILE *fp, const DMImage *pimg, const DMImageConvSpec *spec);
 } DMImageFormat;
 
 
@@ -104,22 +104,25 @@
 BOOL dmCompareColor(const DMColor *c1, const DMColor *c2, BOOL alpha);
 
 
-int dmWriteImageData(DMImage *img, void *cbdata, int (*writeRowCB)(void *, const Uint8 *, const size_t), const DMImageConvSpec *spec);
+int dmWriteImageData(const DMImage *img, void *cbdata, int (*writeRowCB)(void *, const Uint8 *, const size_t), const DMImageConvSpec *spec);
 
-int dmWriteIFFMasterRAWPalette(FILE *fp, DMImage *img, int ncolors, const char *indent, const char *type);
-int dmWriteRAWImageFILE(FILE *fp, DMImage *img, const DMImageConvSpec *spec);
-int dmWriteRAWImage(const char *filename, DMImage *img, const DMImageConvSpec *spec);
+int dmWriteIFFMasterRAWPalette(FILE *fp, const DMImage *img, int ncolors, const char *indent, const char *type);
+int dmWriteRAWImageFILE(FILE *fp, const DMImage *img, const DMImageConvSpec *spec);
+int dmWriteRAWImage(const char *filename, const DMImage *img, const DMImageConvSpec *spec);
 
-int dmWritePPMImageFILE(FILE *fp, DMImage *img, const DMImageConvSpec *spec);
-int dmWritePPMImage(const char *filename, DMImage *img, const DMImageConvSpec *spec);
+int dmWritePPMImageFILE(FILE *fp, const DMImage *img, const DMImageConvSpec *spec);
+int dmWritePPMImage(const char *filename, const DMImage *img, const DMImageConvSpec *spec);
 
 #ifdef DM_USE_LIBPNG
-int dmWritePNGImageFILE(FILE *fp, DMImage *img, const DMImageConvSpec *spec);
-int dmWritePNGImage(const char *filename, DMImage *img, const DMImageConvSpec *spec);
+int dmWritePNGImageFILE(FILE *fp, const DMImage *img, const DMImageConvSpec *spec);
+int dmWritePNGImage(const char *filename, const DMImage *img, const DMImageConvSpec *spec);
 #endif
 
-int dmWritePCXImageFILE(FILE *fp, DMImage *img, const DMImageConvSpec *spec);
-int dmWritePCXImage(const char *filename, DMImage *img, const DMImageConvSpec *spec);
+int dmReadILBMImageFILE(FILE *fp, DMImage **pimg);
+int dmReadILBMImage(const char *filename, DMImage **pimg);
+
+int dmWritePCXImageFILE(FILE *fp, const DMImage *img, const DMImageConvSpec *spec);
+int dmWritePCXImage(const char *filename, const DMImage *img, const DMImageConvSpec *spec);
 int dmReadPCXImageFILE(FILE *fp, DMImage **pimg);
 int dmReadPCXImage(const char *filename, DMImage **pimg);