From 1f896dbc2b299f111375a324958a3b6e15693ed5 Mon Sep 17 00:00:00 2001 From: David Rose Date: Wed, 4 Jun 2003 22:44:44 +0000 Subject: [PATCH] pass dirname to Filename::make_canonical --- pandatool/src/egg-palettize/filenameUnifier.cxx | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pandatool/src/egg-palettize/filenameUnifier.cxx b/pandatool/src/egg-palettize/filenameUnifier.cxx index 95dddbc57d..ef71db79fc 100644 --- a/pandatool/src/egg-palettize/filenameUnifier.cxx +++ b/pandatool/src/egg-palettize/filenameUnifier.cxx @@ -141,15 +141,18 @@ make_canonical(Filename &filename) { return; } - string dirname = filename.get_dirname(); + Filename orig_dirname = filename.get_dirname(); CanonicalFilenames::iterator fi; - fi = _canonical_filenames.find(dirname); + fi = _canonical_filenames.find(orig_dirname); if (fi != _canonical_filenames.end()) { filename.set_dirname((*fi).second); return; } - filename.make_canonical(); - _canonical_filenames.insert(CanonicalFilenames::value_type(dirname, filename.get_dirname())); + Filename new_dirname = orig_dirname; + new_dirname.make_canonical(); + filename.set_dirname(new_dirname); + + _canonical_filenames.insert(CanonicalFilenames::value_type(orig_dirname, new_dirname)); }