From bfe5c7c2b911b8fd27169360ec2bd45a3f07169c Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Fri, 10 May 2019 23:10:14 +0200 Subject: [PATCH] Fixed #265: put CIF at the end of the detection chain The CIF format is kind of fuzzy and supports a high degree of syntactic freedom. Hence the format detection is not quite reliable. Do CIF as last resort. --- src/plugins/streamers/cif/db_plugin/dbCIF.cc | 4 +++- src/plugins/streamers/dxf/db_plugin/dbDXF.cc | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/plugins/streamers/cif/db_plugin/dbCIF.cc b/src/plugins/streamers/cif/db_plugin/dbCIF.cc index 2218b33dc..318163533 100644 --- a/src/plugins/streamers/cif/db_plugin/dbCIF.cc +++ b/src/plugins/streamers/cif/db_plugin/dbCIF.cc @@ -185,7 +185,9 @@ public: } }; -static tl::RegisteredClass 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 reader_decl (new CIFFormatDeclaration (), 2100, "CIF"); // provide a symbol to force linking against int force_link_CIF = 0; diff --git a/src/plugins/streamers/dxf/db_plugin/dbDXF.cc b/src/plugins/streamers/dxf/db_plugin/dbDXF.cc index 3b81a2be2..8a30fd350 100644 --- a/src/plugins/streamers/dxf/db_plugin/dbDXF.cc +++ b/src/plugins/streamers/dxf/db_plugin/dbDXF.cc @@ -166,7 +166,7 @@ public: } }; -static tl::RegisteredClass reader_decl (new DXFFormatDeclaration (), 100, "DXF"); +static tl::RegisteredClass reader_decl (new DXFFormatDeclaration (), 2000, "DXF"); // provide a symbol to force linking against int force_link_DXF = 0;