Merge pull request #2261 from mccode-dev/main

Sync

Author: willend

mcstas-comps/examples/Tests_union/Geometry_test/Geometry_test.instr

@@ -19,13 +19,14 @@
 * Use of all basic geometries, mesh(as a torus), sphere, cylinder, cone and box
 *
 * %Example: meshfile="torus.off" Detector: detector_scat_I=40.2053
+* %Example: meshfile="torus.STL" Detector: detector_scat_I=40.2053
 *
 * %Parameters
 *
 * %End
 *******************************************************************************/
 
-DEFINE INSTRUMENT Geometry_test(string meshfile="torus.off")
+DEFINE INSTRUMENT Geometry_test(string meshfile="torus.STL")
 
 DECLARE
 %{

mcstas-comps/union/Union_mesh.comp

@@ -222,8 +222,7 @@ void read_stl(char* filename,
       fclose(file);  
 
    } else {
-#ifndef _MSC_EXTENSIONS
-       FILE *file = Open_File(filename, "r", NULL);
+       FILE *file = Open_File(filename, "rb", NULL);
        // Read header
        char header[80];
        fread(header, sizeof(char), 80, file);
@@ -247,9 +246,6 @@ void read_stl(char* filename,
        }
 
       fclose(file);
-#else
-      fprintf(stderr,"Union_mesh ERROR:\n  Binary STL is not yet supported when compiling with MSVC.\n  Please convert file to e.g. ascii OFF via meshlab.\n.");
-#endif
    }
 
    *n_verts = 3* *n_faces;