Merge remote-tracking branch 'origin/master' into dvb

This commit is contained in:
Matthias Koefferlein
2019-05-29 22:32:05 +02:00
18 changed files with 1019 additions and 228 deletions
+3 -1
View File
@@ -185,7 +185,9 @@ public:
}
};
static tl::RegisteredClass<db::StreamFormatDeclaration> reader_decl (new CIFFormatDeclaration (), 100, "CIF");
// NOTE: Because CIF has such a high degree of syntactic freedom, the detection is somewhat
// fuzzy: do CIF at the very end of the detection chain
static tl::RegisteredClass<db::StreamFormatDeclaration> reader_decl (new CIFFormatDeclaration (), 2100, "CIF");
// provide a symbol to force linking against
int force_link_CIF = 0;
+1 -1
View File
@@ -166,7 +166,7 @@ public:
}
};
static tl::RegisteredClass<db::StreamFormatDeclaration> reader_decl (new DXFFormatDeclaration (), 100, "DXF");
static tl::RegisteredClass<db::StreamFormatDeclaration> reader_decl (new DXFFormatDeclaration (), 2000, "DXF");
// provide a symbol to force linking against
int force_link_DXF = 0;