Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
otb
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
David Youssefi
otb
Commits
9bcaada2
Commit
9bcaada2
authored
16 years ago
by
Jordi Inglada
Browse files
Options
Downloads
Patches
Plain Diff
ENH: GL_NO_ACCEL becomes GL_USE_ACCEL
parent
6b89bc8b
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
CMakeLists.txt
+5
-5
5 additions, 5 deletions
CMakeLists.txt
Code/Visu/otbImageWidgetBase.txx
+5
-2
5 additions, 2 deletions
Code/Visu/otbImageWidgetBase.txx
with
10 additions
and
7 deletions
CMakeLists.txt
+
5
−
5
View file @
9bcaada2
...
...
@@ -228,12 +228,12 @@ IF(OTB_USE_VISU_GUI)
#-------------------------------
# Display images using textures using video card acceleration
#-------------------------------
OPTION
(
GL_
NO
_ACCEL
"
Do not u
se video card acceleration."
O
FF
)
MARK_AS_ADVANCED
(
GL_
NO
_ACCEL
)
IF
(
GL_
NO
_ACCEL
)
OPTION
(
GL_
USE
_ACCEL
"
U
se video card acceleration."
O
N
)
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
)
...
...
This diff is collapsed.
Click to expand it.
Code/Visu/otbImageWidgetBase.txx
+
5
−
2
View file @
9bcaada2
...
...
@@ -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
#if
n
def GL_
USE
_ACCEL
glEnable(GL_BLEND);
glBlendFunc(GL_SRC_ALPHA,GL_ONE_MINUS_SRC_ALPHA);
glDrawPixels(m_BufferedRegion.GetSize()[0],
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment