fix some compilation issues on various platforms
This commit is contained in:
+1
-1
@@ -1809,7 +1809,7 @@ void Node::LoadImmediate(QXmlStreamReader *reader, const QString& input, int ele
|
||||
if (reader->name() == QStringLiteral("key")) {
|
||||
QString key_input;
|
||||
rational key_time;
|
||||
NodeKeyframe::Type key_type;
|
||||
NodeKeyframe::Type key_type = NodeKeyframe::kLinear;
|
||||
QVariant key_value;
|
||||
QPointF key_in_handle;
|
||||
QPointF key_out_handle;
|
||||
|
||||
+7
-9
@@ -1183,17 +1183,15 @@ T* Node::ValueToPtr(const QVariant &ptr)
|
||||
template<class T>
|
||||
void Node::FindOutputNodeInternal(const Node* n, QVector<T *>& list)
|
||||
{
|
||||
foreach (const std::vector<NodeInput>& outputs, n->output_connections_) {
|
||||
foreach (const NodeInput& output, outputs) {
|
||||
Node* connected = output.node();
|
||||
T* cast_test = dynamic_cast<T*>(connected);
|
||||
foreach (const OutputConnection& output, n->output_connections_) {
|
||||
Node* connected = output.second.node();
|
||||
T* cast_test = dynamic_cast<T*>(connected);
|
||||
|
||||
if (cast_test) {
|
||||
list.append(cast_test);
|
||||
}
|
||||
|
||||
FindOutputNodeInternal<T>(connected);
|
||||
if (cast_test) {
|
||||
list.append(cast_test);
|
||||
}
|
||||
|
||||
FindOutputNodeInternal<T>(connected);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -281,7 +281,7 @@ void ColorManager::InputValueChangedEvent(const QString &input, int element)
|
||||
|
||||
try {
|
||||
SetConfig(OCIO::Config::CreateFromFile(GetConfigFilename().toUtf8()));
|
||||
} catch (OCIO::Exception& e) {}
|
||||
} catch (OCIO::Exception&) {}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user