No commit message

No commit message

Common/CreateFile.cpp

@@ -26,8 +26,6 @@
 #include "gl2yuv.h"
 #endif
 
-extern int mpeg_encode_main(int, char**); 
-
 int GuessFileFormatFromFileName(std::string fileName)
 {
   std::string ext = SplitFileName(fileName)[2];
@@ -473,6 +471,7 @@ void CreateOutputFile(std::string fileName, int format)
       }
       fprintf(fp, "END_INPUT\n");
       fclose(fp);
+      extern int mpeg_encode_main(int, char**);
       char *args[] = {(char*)"gmsh", (char*)parFileName.c_str()};
       try{
         mpeg_encode_main(2, args);

Mesh/meshGFace.cpp

@@ -1334,7 +1334,7 @@ void deMeshGFace::operator() (GFace *gf)
   gf->meshStatistics.nbTriangle = gf->meshStatistics.nbEdge = 0;
 }
 
-int debugSurface = -100;
+int debugSurface = -1;
 
 void meshGFace::operator() (GFace *gf)
 {

benchmarks/boolean/constraintSurface.lua

@@ -29,3 +29,4 @@ e14 = g:addLine (v14,v11);
 
 g:addRuledFaces ({{e7},{e17}})
 g:addFace ({e7,e8},{{0,0,0}})
+g:addFace ({e11,e12,e13,e14})

contrib/mpeg_encode/README.txt

 *************************************************************************
 This is a heavily modified version of mpeg_encode, version 1.5b, for
-inclusion in gmsh. The code was made to compile in C++ and modified so
+inclusion in Gmsh. The code was made to compile in C++ and modified so
 that all errors throw exceptions.
 
 FIXME: When used as a subroutine the code clearly leaks memory (see

doc/CREDITS.txt

@@ -87,6 +87,10 @@ subdirectory) written by George Karypis (karypis at cs.umn.edu),
 copyright (C) 1998 Regents of the University of Minnesota: check the
 configuration options.
 
+This version of Gmsh may contain code (in the contrib/mpeg_encode
+subdirectory) copyright (c) 1995 The Regents of the University of
+California: check the configuration options.
+
 This version of Gmsh may contain code (in the
 contrib/NativeFileChooser subdirectory), copyright (C) 2004 Greg
 Ercolano: check the configuration options.