Skip to content
Snippets Groups Projects
Commit e70eee79 authored by Julien Michel's avatar Julien Michel
Browse files

STYLE: moving some lines

parent 28f267be
No related branches found
No related tags found
No related merge requests found
...@@ -179,12 +179,14 @@ ImageWidgetBase<TPixel> ...@@ -179,12 +179,14 @@ ImageWidgetBase<TPixel>
{ {
m_Image=image; m_Image=image;
m_Image->UpdateOutputInformation(); m_Image->UpdateOutputInformation();
SizeType size; SizeType size;
size.Fill(0); size.Fill(0);
m_BufferedRegion.SetSize(size); m_BufferedRegion.SetSize(size);
SizeType displaySize; SizeType displaySize;
displaySize[0]=this->w(); displaySize[0]=this->w();
displaySize[1]=this->h(); displaySize[1]=this->h();
m_ViewedRegion.SetSize(displaySize); m_ViewedRegion.SetSize(displaySize);
m_ViewedRegion.Crop(m_Image->GetLargestPossibleRegion()); m_ViewedRegion.Crop(m_Image->GetLargestPossibleRegion());
} }
...@@ -298,14 +300,10 @@ ImageWidgetBase<TPixel> ...@@ -298,14 +300,10 @@ ImageWidgetBase<TPixel>
m_ImageOverlay->SetRequestedRegion(m_BufferedRegion); m_ImageOverlay->SetRequestedRegion(m_BufferedRegion);
m_ImageOverlay->PropagateRequestedRegion(); m_ImageOverlay->PropagateRequestedRegion();
m_ImageOverlay->UpdateOutputData(); m_ImageOverlay->UpdateOutputData();
RebuildOpenGlImageOverlayBuffer();
} }
} }
if(m_ImageOverlayVisible)
{
RebuildOpenGlImageOverlayBuffer();
}
if (!this->valid()) if (!this->valid())
{ {
valid(1); valid(1);
...@@ -327,7 +325,7 @@ ImageWidgetBase<TPixel> ...@@ -327,7 +325,7 @@ ImageWidgetBase<TPixel>
glRasterPos2i(0,0); glRasterPos2i(0,0);
#ifndef OTB_GL_USE_ACCEL #ifndef OTB_GL_USE_ACCEL
glPixelZoom(m_OpenGlIsotropicZoom ,m_OpenGlIsotropicZoom); glPixelZoom(m_OpenGlIsotropicZoom, m_OpenGlIsotropicZoom);
// display the image // display the image
glDrawPixels(m_BufferedRegion.GetSize()[0], glDrawPixels(m_BufferedRegion.GetSize()[0],
...@@ -428,7 +426,6 @@ ImageWidgetBase<TPixel> ...@@ -428,7 +426,6 @@ ImageWidgetBase<TPixel>
//otbMsgDebugMacro(<<"Deleting previous buffer ..."); //otbMsgDebugMacro(<<"Deleting previous buffer ...");
delete [] m_OpenGlBuffer; delete [] m_OpenGlBuffer;
} }
//otbMsgDebugMacro(<<"Buffered region: "<<m_BufferedRegion);
unsigned int bufferLenght = 4*m_BufferedRegion.GetNumberOfPixels(); unsigned int bufferLenght = 4*m_BufferedRegion.GetNumberOfPixels();
//otbMsgDebugMacro(<<"New buffer lenght: "<<bufferLenght); //otbMsgDebugMacro(<<"New buffer lenght: "<<bufferLenght);
m_OpenGlBuffer = new unsigned char[bufferLenght]; m_OpenGlBuffer = new unsigned char[bufferLenght];
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment