X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5a566d89be51576b079dc1b7940304390d11b950..77380b5cbae9f748f53a05a2733c8f624e2ad40c:/samples/image/image.cpp diff --git a/samples/image/image.cpp b/samples/image/image.cpp index 8dca999ea3..159f7fe26b 100644 --- a/samples/image/image.cpp +++ b/samples/image/image.cpp @@ -81,6 +81,9 @@ public: wxBitmap *my_square; wxBitmap *my_anti; + wxBitmap *my_horse_asciigrey_pnm; + wxBitmap *my_horse_rawgrey_pnm; + int xH, yH ; int m_ani_images ; @@ -152,14 +155,14 @@ public: wxT(""), wxT(""), (const wxChar *)NULL, - wxT("BMP files (*.bmp)|*.bmp|") - wxT("PNG files (*.png)|*.png|") - wxT("JPEG files (*.jpg)|*.jpg|") - wxT("GIF files (*.gif)|*.gif|") - wxT("TIFF files (*.tif)|*.tif|") - wxT("PCX files (*.pcx)|*.pcx|") - wxT("ICO files (*.ico)|*.ico|") - wxT("CUR files (*.cur)|*.cur"), + wxT("BMP files (*.bmp)|*.bmp|") + wxT("PNG files (*.png)|*.png|") + wxT("JPEG files (*.jpg)|*.jpg|") + wxT("GIF files (*.gif)|*.gif|") + wxT("TIFF files (*.tif)|*.tif|") + wxT("PCX files (*.pcx)|*.pcx|") + wxT("ICO files (*.ico)|*.ico|") + wxT("CUR files (*.cur)|*.cur"), wxSAVE, this); @@ -184,7 +187,7 @@ public: wxBMP_24BPP }; - static const wxString bppchoices[] = + const wxString bppchoices[] = { _T("1 bpp color"), _T("1 bpp B&W"), @@ -213,7 +216,7 @@ public: cmap[i] = (unsigned char)i; image.SetPalette(wxPalette(256, cmap, cmap, cmap)); - delete cmap; + delete[] cmap; } } } @@ -229,7 +232,7 @@ public: wxPNG_TYPE_GREY_RED, }; - static const wxString pngchoices[] = + const wxString pngchoices[] = { _T("Colour 8bpp"), _T("Colour 16bpp"), @@ -305,7 +308,7 @@ public: return; } -// data.UseAlpha(); + data.UseAlpha(); Data::Iterator p(data); @@ -319,10 +322,12 @@ public: for ( int x = 0; x < REAL_SIZE; ++x ) { - p.Red() = r; - p.Green() = g; - p.Blue() = b; - p.Alpha() = (Data::Iterator::ChannelType)((x*255.)/REAL_SIZE); + // note that RGB must be premultiplied by alpha + unsigned a = (Data::Iterator::ChannelType)((x*255.)/REAL_SIZE); + p.Red() = r * a / 256; + p.Green() = g * a / 256; + p.Blue() = b * a / 256; + p.Alpha() = a; ++p; // same as p.OffsetX(1) } @@ -408,6 +413,9 @@ MyCanvas::MyCanvas( wxWindow *parent, wxWindowID id, my_square = (wxBitmap*) NULL; my_anti = (wxBitmap*) NULL; + my_horse_asciigrey_pnm = (wxBitmap*) NULL; + my_horse_rawgrey_pnm = (wxBitmap*) NULL; + m_ani_images = 0 ; SetBackgroundColour(* wxWHITE); @@ -504,6 +512,20 @@ MyCanvas::MyCanvas( wxWindow *parent, wxWindowID id, wxLogError(wxT("Can't load PNM image")); else my_horse_pnm = new wxBitmap( image ); + + image.Destroy(); + + if ( !image.LoadFile( dir + _T("horse_ag.pnm"), wxBITMAP_TYPE_PNM ) ) + wxLogError(wxT("Can't load PNM image")); + else + my_horse_asciigrey_pnm = new wxBitmap( image ); + + image.Destroy(); + + if ( !image.LoadFile( dir + _T("horse_rg.pnm"), wxBITMAP_TYPE_PNM ) ) + wxLogError(wxT("Can't load PNM image")); + else + my_horse_rawgrey_pnm = new wxBitmap( image ); #endif #if wxUSE_LIBTIFF @@ -620,6 +642,8 @@ MyCanvas::~MyCanvas() delete my_smile_xbm; delete my_square; delete my_anti; + delete my_horse_asciigrey_pnm; + delete my_horse_rawgrey_pnm; } void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) ) @@ -674,6 +698,14 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) ) if (my_horse_pnm && my_horse_pnm->Ok()) dc.DrawBitmap( *my_horse_pnm, 30, 1300 ); + dc.DrawText( _T("PNM handler (ascii grey)"), 280, 1285 ); + if (my_horse_asciigrey_pnm && my_horse_asciigrey_pnm->Ok()) + dc.DrawBitmap( *my_horse_asciigrey_pnm, 280, 1300 ); + + dc.DrawText( _T("PNM handler (raw grey)"), 530, 1285 ); + if (my_horse_rawgrey_pnm && my_horse_rawgrey_pnm->Ok()) + dc.DrawBitmap( *my_horse_rawgrey_pnm, 530, 1300 ); + dc.DrawText( _T("TIFF handler"), 30, 1515 ); if (my_horse_tiff && my_horse_tiff->Ok()) dc.DrawBitmap( *my_horse_tiff, 30, 1530 ); @@ -866,10 +898,10 @@ void MyCanvas::CreateAntiAliasedBitmap() enum { - ID_QUIT = 108, - ID_ABOUT, - ID_NEW, - ID_SHOWRAW + ID_QUIT = wxID_EXIT, + ID_ABOUT = wxID_ABOUT, + ID_NEW = 100, + ID_SHOWRAW = 101 }; IMPLEMENT_DYNAMIC_CLASS( MyFrame, wxFrame )