Kaydet (Commit) 62bf8e2f authored tarafından Tor Lillqvist's avatar Tor Lillqvist

Store the image bitmaps in MyWorkWindow in the OpenGL case

Change-Id: I1acac06f076a4f8173929a0fe0c0d9eaf6b8d1ff
üst 9df8d2a9
...@@ -45,6 +45,8 @@ public: ...@@ -45,6 +45,8 @@ public:
virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE;
virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE;
virtual void Resize() SAL_OVERRIDE; virtual void Resize() SAL_OVERRIDE;
std::vector<Bitmap*>maBitmaps;
}; };
MyWorkWindow::MyWorkWindow( const char *kind, vcl::Window* pParent, WinBits nWinStyle ) : MyWorkWindow::MyWorkWindow( const char *kind, vcl::Window* pParent, WinBits nWinStyle ) :
...@@ -251,8 +253,6 @@ void IconTestApp::DoItWithOpenGL(std::vector<OUString>& aImageFiles) ...@@ -251,8 +253,6 @@ void IconTestApp::DoItWithOpenGL(std::vector<OUString>& aImageFiles)
pWindow->SetText(OUString("OpenGL Image Test")); pWindow->SetText(OUString("OpenGL Image Test"));
Point aPos(10, 10);
for (std::vector<OUString>::const_iterator i = aImageFiles.cbegin(); i != aImageFiles.end(); ++i) for (std::vector<OUString>::const_iterator i = aImageFiles.cbegin(); i != aImageFiles.end(); ++i)
{ {
SvFileStream aFileStream( *i, STREAM_READ ); SvFileStream aFileStream( *i, STREAM_READ );
...@@ -261,16 +261,7 @@ void IconTestApp::DoItWithOpenGL(std::vector<OUString>& aImageFiles) ...@@ -261,16 +261,7 @@ void IconTestApp::DoItWithOpenGL(std::vector<OUString>& aImageFiles)
if (aGraphicFilter.ImportGraphic(aGraphic, *i, aFileStream) != 0) if (aGraphicFilter.ImportGraphic(aGraphic, *i, aFileStream) != 0)
continue; continue;
SAL_INFO("vcl.icontest", *i << ": size: " << aGraphic.GetSizeBytes() << "B, " << aGraphic.GetSizePixel()); SAL_INFO("vcl.icontest", *i << ": size: " << aGraphic.GetSizeBytes() << "B, " << aGraphic.GetSizePixel());
Size aSize( 100, 100 ); pWindow->maBitmaps.push_back(new Bitmap( aGraphic.GetBitmap( ) ) );
// Bitmap *pBitmap = new Bitmap( aGraphic.GetBitmap( ) );
aPos.Move( aSize.Width() + 10, 0);
if ( aPos.X() > 800 )
{
aPos.setX( 10 );
aPos.setY( aPos.Y() + aSize.Height() + 10 );
}
} }
pWindow->Hide(); pWindow->Hide();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment