TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-03 02:15:43 -04:00
Code Issues Packages Projects Releases Wiki Activity

pass dirname to Filename::make_canonical

Browse Source
This commit is contained in:
David Rose 2003-06-04 22:44:44 +00:00
parent 9fdb85793c
commit 1f896dbc2b
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pandatool/src/egg-palettize/filenameUnifier.cxx
View File

@ -141,15 +141,18 @@ make_canonical(Filename &filename) {
return; return;
} }
string dirname = filename.get_dirname(); Filename orig_dirname = filename.get_dirname();
CanonicalFilenames::iterator fi; CanonicalFilenames::iterator fi;
fi = _canonical_filenames.find(dirname); fi = _canonical_filenames.find(orig_dirname);
if (fi != _canonical_filenames.end()) { if (fi != _canonical_filenames.end()) {
filename.set_dirname((*fi).second); filename.set_dirname((*fi).second);
return; return;
} }
filename.make_canonical(); Filename new_dirname = orig_dirname;
_canonical_filenames.insert(CanonicalFilenames::value_type(dirname, filename.get_dirname())); new_dirname.make_canonical();
filename.set_dirname(new_dirname);
_canonical_filenames.insert(CanonicalFilenames::value_type(orig_dirname, new_dirname));
} }