Commit 2a6624e7 authored by slevy's avatar slevy
Browse files

Fix more const lint found by gcc 4.8.

parent a318b906
......@@ -203,7 +203,7 @@ void Appearance::init() {
Appearance::~Appearance() {
if(txfname) Free(txfname);
if(txdir) free(txdir);
if(txdir) free((void *)txdir);
if(name) Free(name);
// if(txloaded) IMAGEbuff::schedule_expunge(txim);
}
......@@ -616,7 +616,7 @@ const char *MayaScene::parseFileNode( const char *name, FILE *f, char *reline, i
ap->txfname = shmstrdup( av[4] );
if(this->fname != NULL) {
char *tail = strrchr( this->fname, '/' );
const char *tail = strrchr( this->fname, '/' );
if(tail) {
int len = tail - this->fname + 1;
ap->txdir = static_cast<char *>(malloc( len+1 ));
......@@ -838,7 +838,7 @@ int MayaScene::readScene( const char *scenefname, int complain )
void Appearance::loadTextures()
{
if(txfname != NULL && txloaded == 0) {
char *cp = strrchr(txfname, '/');
const char *cp = strrchr(txfname, '/');
if(cp == NULL) cp = txfname;
else cp++;
char *fullname = findfile( txdir, cp );
......
......@@ -106,7 +106,7 @@ class Appearance : public Shmem {
float Cspec[3]; /* specular color */
/* in case we're textured... */
const char *txdir; /* directory in which to search for textures */
char *txdir; /* directory in which to search for textures */
const char *txfname;
Texture *txim;
int txloaded;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment