merged two fixes by Edgar

metadata
Wenzel Jakob 2014-04-03 16:46:06 +02:00
commit 2cb71227ef
3 changed files with 3 additions and 3 deletions

View File

@ -37,7 +37,7 @@ add_custom_target (scene_schema
set_target_properties (scene_schema PROPERTIES FOLDER "data")
# Actual installation
install(FILES "scene.xsd" "upgrade_0.3.0.xsl" "upgrade_0.4.0.xsl"
install(FILES "scene.xsd" "upgrade_0.3.0.xsl" "upgrade_0.4.0.xsl" "upgrade_0.5.0.xsl"
DESTINATION ${SCHEMA_DESTINATION}
PERMISSIONS "OWNER_READ" "GROUP_READ" "WORLD_READ"
COMPONENT Runtime

View File

@ -280,7 +280,7 @@ public:
Vector2i(m_blockSize, m_blockSize));
} else {
m_tile = new Bitmap(Bitmap::EMultiChannel, m_componentFormat,
Vector2i(m_blockSize, m_blockSize), m_channelNames.size());
Vector2i(m_blockSize, m_blockSize), (uint8_t) m_channelNames.size());
m_tile->setChannelNames(m_channelNames);
}

View File

@ -165,7 +165,7 @@ public:
}
break;
case EPrimIndex:
result = Spectrum((int) its.primIndex);
result = Spectrum((Float) its.primIndex);
break;
default:
Log(EError, "Internal error!");