From 375e7c76abf14cf01261f035c748fe394930dd09 Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Sun, 23 May 2010 10:45:05 +0000
Subject: [PATCH]
---
Common/CreateFile.cpp | 3 +--
Mesh/meshGFace.cpp | 2 +-
benchmarks/boolean/constraintSurface.lua | 1 +
contrib/mpeg_encode/README.txt | 2 +-
doc/CREDITS.txt | 4 ++++
5 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/Common/CreateFile.cpp b/Common/CreateFile.cpp
index 3035e2e1cc..1be61dcd71 100644
--- a/Common/CreateFile.cpp
+++ b/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);
diff --git a/Mesh/meshGFace.cpp b/Mesh/meshGFace.cpp
index 854874116e..f3159f3a1c 100644
--- a/Mesh/meshGFace.cpp
+++ b/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)
{
diff --git a/benchmarks/boolean/constraintSurface.lua b/benchmarks/boolean/constraintSurface.lua
index 07504da19f..85dee40eb7 100644
--- a/benchmarks/boolean/constraintSurface.lua
+++ b/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})
diff --git a/contrib/mpeg_encode/README.txt b/contrib/mpeg_encode/README.txt
index 199dd797d0..6825d58877 100644
--- a/contrib/mpeg_encode/README.txt
+++ b/contrib/mpeg_encode/README.txt
@@ -1,6 +1,6 @@
*************************************************************************
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
diff --git a/doc/CREDITS.txt b/doc/CREDITS.txt
index cdaea7208d..3d30a59d72 100644
--- a/doc/CREDITS.txt
+++ b/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.
--
GitLab