FGFS-4.1/simgear
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CanvasImage: rename 'file' to 'src'.

Browse Source
This commit is contained in:
Thomas Geymayer
2014-03-20 11:42:02 +01:00
parent fd51518d92
commit ff53792e4f
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
simgear/canvas/elements/CanvasImage.cxx
+5 -2
View File
@@ -520,8 +520,11 @@ namespace canvas
_attributes_dirty |= DEST_SIZE; _attributes_dirty |= DEST_SIZE;
} }
else if( name == "file" ) else if( name == "src" || name == "file" )
{ {
if( name == "file" )
SG_LOG(SG_GL, SG_WARN, "'file' is deprecated. Use 'src' instead");
static const std::string PROTOCOL_SEP = "://"; static const std::string PROTOCOL_SEP = "://";
std::string url = child->getStringValue(), std::string url = child->getStringValue(),
@@ -682,7 +685,7 @@ namespace canvas
return; return;
// Now try with MIME type // Now try with MIME type
rw = reg->getReaderWriterForMimeType(req->responseMime()); rw = reg->getReaderWriterForMimeType(mime);
if( rw && loadImage(*rw, img_data, *req, "MIME type") ) if( rw && loadImage(*rw, img_data, *req, "MIME type") )
return; return;