Commit 2a75c2b4 authored by bonnell's avatar bonnell

Fixed erroneous warning messaged that popped up when adding Image Annotation...

Fixed erroneous warning messaged that popped up when adding Image Annotation objects.  Resolves #2316

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@26741 18c085ea-50e0-402c-830e-de6fd14e8384
parent 7d9dd389
......@@ -441,6 +441,10 @@ avtImageColleague::SetOptions(const AnnotationObject &annot)
// Add an error message if the file can't be read. Add support for tilde's
// for home directories.
//
// Kathleen Biagas, Wed Jul 1 12:15:00 PDT 2015
// No need to ExpandPath if filename is empty. This change prevents
// unnecessary warning message.
//
// ****************************************************************************
bool
......@@ -448,7 +452,8 @@ avtImageColleague::UpdateImage(std::string filename)
{
bool retval = true;
filename = FileFunctions::ExpandPath(filename);
if (!filename.empty())
filename = FileFunctions::ExpandPath(filename);
// Get a reader for filename if possible.
vtkImageReader2 *r =
......
......@@ -105,7 +105,7 @@ enhancements and bug-fixes that were added to this release.</p>
<p><b><font size="4">Other bugs fixed in version 2.10</font></b></p>
<ul>
<li>2D Line annotation has been fixed so that adding arrowheads does not make the line disappear.</li>
<li></li>
<li>A bug that caused a warning message to pop up when adding Image Annotation objects has been fixed.</li>
<li></li>
<li></li>
</ul>
......
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