Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Fixed: warning when destination file doesn'texist

Browse source
This commit is contained in:
kervala 2010-09-01 21:46:39 +02:00
parent 44ae363d64
commit 6781fcf098
1 changed files with 16 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
code/nel/tools/3d/tga_2_dds/tga2dds.cpp
View file

@ -37,18 +37,18 @@ using namespace std;
#define NOT_DEFINED 0xff #define NOT_DEFINED 0xff
bool sameType(const char *sFileNameDest, uint8 algo); bool sameType(const std::string &sFileNameDest, uint8 algo);
bool dataCheck(const char *sFileNameSrc, const char *sFileNameDest, uint8 algo); bool dataCheck(const std::string &sFileNameSrc, const std::string &FileNameDest, uint8 algo);
std::string getOutputFileName(const std::string &inputFileName); std::string getOutputFileName(const std::string &inputFileName);
void writeInstructions(); void writeInstructions();
uint8 getType(const char *sFileNameDest) uint8 getType(const std::string &sFileNameDest)
{ {
uint32 dds; uint32 dds;
FILE *f = fopen(sFileNameDest,"rb"); FILE *f = fopen(sFileNameDest.c_str(),"rb");
if(f==NULL) if(f==NULL)
{ {
return NOT_DEFINED; return NOT_DEFINED;
@ -97,10 +97,10 @@ uint8 getType(const char *sFileNameDest)
return NOT_DEFINED; return NOT_DEFINED;
} }
bool sameType(const char *sFileNameDest, uint8 &algo, bool wantMipMap) bool sameType(const std::string &sFileNameDest, uint8 &algo, bool wantMipMap)
{ {
uint32 dds; uint32 dds;
FILE *f = fopen(sFileNameDest,"rb"); FILE *f = fopen(sFileNameDest.c_str(),"rb");
if(f==NULL) if(f==NULL)
{ {
return false; return false;
@ -163,23 +163,22 @@ bool sameType(const char *sFileNameDest, uint8 &algo, bool wantMipMap)
bool dataCheck(const char *sFileNameSrc, const char *sFileNameDest, uint8& algo, bool wantMipMap) bool dataCheck(const std::string &sFileNameSrc, const std::string &sFileNameDest, uint8& algo, bool wantMipMap)
{ {
uint32 lastWriteTime1 = CFile::getFileModificationDate(sFileNameSrc); if (!CFile::fileExists(sFileNameSrc))
if (!lastWriteTime1)
{ {
cerr << "Can't open file " << sFileNameSrc << endl; cerr << "Can't open file " << sFileNameSrc << endl;
return false; return false;
} }
uint32 lastWriteTime2 = CFile::getFileModificationDate(sFileNameDest); if (!CFile::fileExists(sFileNameDest))
if (!lastWriteTime2)
{ {
return false; // destination file doesn't exist yet return false; // destination file doesn't exist yet
} }
uint32 lastWriteTime1 = CFile::getFileModificationDate(sFileNameSrc);
uint32 lastWriteTime2 = CFile::getFileModificationDate(sFileNameDest);
if(lastWriteTime1 > lastWriteTime2) if(lastWriteTime1 > lastWriteTime2)
{ {
return false; return false;
@ -430,7 +429,7 @@ int main(int argc, char **argv)
// Check dest algo // Check dest algo
if (OptAlgo==NOT_DEFINED) if (OptAlgo==NOT_DEFINED)
OptAlgo = getType (outputFileName.c_str()); OptAlgo = getType (outputFileName);
// Choose Algo. // Choose Algo.
if(OptAlgo!=NOT_DEFINED) if(OptAlgo!=NOT_DEFINED)
@ -447,7 +446,7 @@ int main(int argc, char **argv)
// Data check // Data check
//=========== //===========
if(dataCheck(inputFileName.c_str(),outputFileName.c_str(), OptAlgo, OptMipMap)) if(dataCheck(inputFileName,outputFileName, OptAlgo, OptMipMap))
{ {
cout<<outputFileName<<" : a recent dds file already exists"<<endl; cout<<outputFileName<<" : a recent dds file already exists"<<endl;
return 0; return 0;