From 9bcaada2b10bbbee21af9dfef4297f6a6e0840f7 Mon Sep 17 00:00:00 2001
From: Jordi Inglada <jordi.inglada@orfeo-toolbox.org>
Date: Mon, 24 Nov 2008 13:55:00 +0100
Subject: [PATCH] ENH: GL_NO_ACCEL becomes GL_USE_ACCEL
---
CMakeLists.txt | 10 +++++-----
Code/Visu/otbImageWidgetBase.txx | 7 +++++--
2 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d0d27b8388..84769a2b20 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -228,12 +228,12 @@ IF(OTB_USE_VISU_GUI)
#-------------------------------
# Display images using textures using video card acceleration
#-------------------------------
- OPTION(GL_NO_ACCEL "Do not use video card acceleration." OFF)
- MARK_AS_ADVANCED(GL_NO_ACCEL)
- IF(GL_NO_ACCEL)
+ OPTION(GL_USE_ACCEL "Use video card acceleration." ON)
+ MARK_AS_ADVANCED(GL_USE_ACCEL)
+ IF(GL_USE_ACCEL)
# Add compiler option
- ADD_DEFINITIONS(-DGL_NO_ACCEL)
- ENDIF(GL_NO_ACCEL)
+ ADD_DEFINITIONS(-DGL_USE_ACCEL)
+ ENDIF(GL_USE_ACCEL)
diff --git a/Code/Visu/otbImageWidgetBase.txx b/Code/Visu/otbImageWidgetBase.txx
index f95d1d385e..2ba2db43ad 100644
--- a/Code/Visu/otbImageWidgetBase.txx
+++ b/Code/Visu/otbImageWidgetBase.txx
@@ -332,7 +332,9 @@ ImageWidgetBase<TPixel>
glRasterPos2i(0,this->h());
-#ifdef GL_NO_ACCEL
+#ifndef GL_USE_ACCEL
+ std::cout << "No accel" << std::endl;
+
glPixelZoom(m_OpenGlIsotropicZoom ,-m_OpenGlIsotropicZoom);
// display the image
@@ -342,6 +344,7 @@ ImageWidgetBase<TPixel>
GL_UNSIGNED_BYTE,
m_OpenGlBuffer);
#else
+ std::cout << "Accel" << std::endl;
glEnable(GL_TEXTURE_2D);
glColor4f(1.0,1.0,1.0,0.0);
GLuint texture;
@@ -368,7 +371,7 @@ ImageWidgetBase<TPixel>
// if image overlay is activated, display image overlay
if(m_ImageOverlayVisible)
{
-#ifdef GL_NO_ACCEL
+#ifndef GL_USE_ACCEL
glEnable(GL_BLEND);
glBlendFunc(GL_SRC_ALPHA,GL_ONE_MINUS_SRC_ALPHA);
glDrawPixels(m_BufferedRegion.GetSize()[0],
--
GitLab