From 8fb49044187cc5a9d90f3a556f8f64a4d7ca2433 Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Thu, 4 Jul 2013 18:21:12 +0000
Subject: [PATCH] pp
---
Fltk/drawContextFltkStringTexture.cpp | 4 ++--
Graphics/drawContext.cpp | 3 +--
utils/misc/package_gmsh_getdp.sh | 6 +++---
3 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/Fltk/drawContextFltkStringTexture.cpp b/Fltk/drawContextFltkStringTexture.cpp
index 8a2a65c158..71aeb43047 100644
--- a/Fltk/drawContextFltkStringTexture.cpp
+++ b/Fltk/drawContextFltkStringTexture.cpp
@@ -89,10 +89,10 @@ class drawContextFltkStringTexture::queueString {
glGenTextures (1, &textureId);
glBindTexture (GL_TEXTURE_RECTANGLE_ARB, textureId);
glTexImage2D (GL_TEXTURE_RECTANGLE_ARB, 0, GL_ALPHA, w, h, 0,
- GL_ALPHA, GL_UNSIGNED_BYTE, data);
+ GL_ALPHA, GL_UNSIGNED_BYTE, data);
//glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_SRC0_ALPHA);
//printf("error %i %s\n", __LINE__, gluErrorString(glGetError()));
- glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
pos = 0;
for(std::vector<element>::iterator it = _elements.begin(); it != _elements.end(); ++it) {
diff --git a/Graphics/drawContext.cpp b/Graphics/drawContext.cpp
index 86c7a6670f..1891469656 100644
--- a/Graphics/drawContext.cpp
+++ b/Graphics/drawContext.cpp
@@ -161,8 +161,7 @@ void drawContext::addQuaternion(double p1x, double p1y, double p2x, double p2y)
double quat[4];
trackball(quat, p1x, p1y, p2x, p2y);
add_quats(quat, quaternion, quaternion);
- if (CTX::instance()->camera) camera.rotate(quat);
-
+ if (CTX::instance()->camera) camera.rotate(quat);
}
void drawContext::addQuaternionFromAxisAndAngle(double axis[3], double angle)
diff --git a/utils/misc/package_gmsh_getdp.sh b/utils/misc/package_gmsh_getdp.sh
index 8796a2f758..c87fd4eb57 100755
--- a/utils/misc/package_gmsh_getdp.sh
+++ b/utils/misc/package_gmsh_getdp.sh
@@ -3,12 +3,12 @@
DATE=`date "+%d/%m/%Y"`
echo "This archive was built on ${DATE} with the latest nightly snapshots of
-Gmsh (http://geuz.org/gmsh) and GetDP (http://geuz.org/getdp).
+Gmsh (http://gmsh.info) and GetDP (http://getdp.info).
Both Gmsh and GetDP are distributed under the terms of the GNU General Public
-License. See the LICENSE_*.txt and CREDITS_*.txt files for more information.
+License. See the LICENSE and CREDITS files for more information.
-See the official websites http://geuz.org/gmsh and http://geuz.org/getdp for
+See the official websites http://gmsh.info and http://getdp.info for
up-to-date versions, documentation and examples." > /tmp/README.txt
rm -rf gmsh-getdp-Windows64
--
GitLab