Blind fixes for warnings in wxTinderbox.

[wxWidgets.git] / samples / image / image.cpp

diff --git a/samples/image/image.cpp b/samples/image/image.cpp
index 7bfe2db778bfb71e12cd5ee0f075341acd8aba2e..04e04cd670a01e72b445f144dcf5e724ddb8bf2f 100644 (file)
--- a/samples/image/image.cpp
+++ b/samples/image/image.cpp
@@ -81,6 +81,11 @@ public:
     wxBitmap  *my_square;
     wxBitmap  *my_anti;
 
     wxBitmap  *my_square;
     wxBitmap  *my_anti;
 

+    wxBitmap  *my_horse_asciigrey_pnm;
+    wxBitmap  *my_horse_rawgrey_pnm;
+
+    wxBitmap  *colorized_horse_jpeg;
+

     int xH, yH ;
     int m_ani_images ;
 
     int xH, yH ;
     int m_ani_images ;
 


@@ -146,20 +151,21 @@ public:
 
     void OnSave(wxMouseEvent& WXUNUSED(event))
     {
 
     void OnSave(wxMouseEvent& WXUNUSED(event))
     {

+#if wxUSE_FILEDLG

         wxImage image = m_bitmap.ConvertToImage();
 
         wxString savefilename = wxFileSelector( wxT("Save Image"),
         wxImage image = m_bitmap.ConvertToImage();
 
         wxString savefilename = wxFileSelector( wxT("Save Image"),

-                                                wxT(""),
-                                                wxT(""),
+                                                wxEmptyString,
+                                                wxEmptyString,

                                                 (const wxChar *)NULL,
                                                 (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);
 
                                                 wxSAVE,
                                                 this);
 


@@ -213,7 +219,7 @@ public:
                         cmap[i] = (unsigned char)i;
                     image.SetPalette(wxPalette(256, cmap, cmap, cmap));
 
                         cmap[i] = (unsigned char)i;
                     image.SetPalette(wxPalette(256, cmap, cmap, cmap));
 

-                    delete cmap;
+                    delete[] cmap;

                 }
             }
         }
                 }
             }
         }


@@ -266,6 +272,7 @@ public:
             // (it may fail if the extension is not recognized):
             image.SaveFile(savefilename);
         }
             // (it may fail if the extension is not recognized):
             image.SaveFile(savefilename);
         }

+#endif // wxUSE_FILEDLG

     }
 
 private:
     }
 
 private:


@@ -405,11 +412,15 @@ MyCanvas::MyCanvas( wxWindow *parent, wxWindowID id,
     my_horse_ico = (wxBitmap*) NULL;
     my_horse_cur = (wxBitmap*) NULL;
     my_horse_ani = (wxBitmap*) NULL;
     my_horse_ico = (wxBitmap*) NULL;
     my_horse_cur = (wxBitmap*) NULL;
     my_horse_ani = (wxBitmap*) NULL;

+    colorized_horse_jpeg = (wxBitmap*) NULL;

 
     my_smile_xbm = (wxBitmap*) NULL;
     my_square = (wxBitmap*) NULL;
     my_anti = (wxBitmap*) NULL;
 
 
     my_smile_xbm = (wxBitmap*) NULL;
     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);
     m_ani_images = 0 ;
 
     SetBackgroundColour(* wxWHITE);


@@ -459,7 +470,14 @@ MyCanvas::MyCanvas( wxWindow *parent, wxWindowID id,
     if ( !image.LoadFile( dir + _T("horse.jpg")) )
         wxLogError(wxT("Can't load JPG image"));
     else
     if ( !image.LoadFile( dir + _T("horse.jpg")) )
         wxLogError(wxT("Can't load JPG image"));
     else

+    {

         my_horse_jpeg = new wxBitmap( image );
         my_horse_jpeg = new wxBitmap( image );

+        // Colorize by rotating green hue to red
+        wxImage::HSVValue greenHSV = wxImage::RGBtoHSV(wxImage::RGBValue(0, 255, 0));
+        wxImage::HSVValue redHSV = wxImage::RGBtoHSV(wxImage::RGBValue(255, 0, 0));
+        image.RotateHue(redHSV.hue - greenHSV.hue);
+        colorized_horse_jpeg = new wxBitmap( image );
+    }

 #endif // wxUSE_LIBJPEG
 
 #if wxUSE_GIF
 #endif // wxUSE_LIBJPEG
 
 #if wxUSE_GIF


@@ -506,6 +524,20 @@ MyCanvas::MyCanvas( wxWindow *parent, wxWindowID id,
         wxLogError(wxT("Can't load PNM image"));
     else
         my_horse_pnm = new wxBitmap( image );
         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
 #endif
 
 #if wxUSE_LIBTIFF


@@ -622,6 +654,9 @@ MyCanvas::~MyCanvas()
     delete my_smile_xbm;
     delete my_square;
     delete my_anti;
     delete my_smile_xbm;
     delete my_square;
     delete my_anti;

+    delete my_horse_asciigrey_pnm;
+    delete my_horse_rawgrey_pnm;
+    delete colorized_horse_jpeg;

 }
 
 void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) )
 }
 
 void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) )


@@ -676,6 +711,14 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) )
     if (my_horse_pnm && my_horse_pnm->Ok())
         dc.DrawBitmap( *my_horse_pnm, 30, 1300 );
 
     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 );
     dc.DrawText( _T("TIFF handler"), 30, 1515 );
     if (my_horse_tiff && my_horse_tiff->Ok())
         dc.DrawBitmap( *my_horse_tiff, 30, 1530 );


@@ -813,6 +856,14 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) )
         {
             dc.DrawBitmap( my_horse_ani[i], 230 + i * 2 * my_horse_ani[i].GetWidth() , 2420, true );
         }
         {
             dc.DrawBitmap( my_horse_ani[i], 230 + i * 2 * my_horse_ani[i].GetWidth() , 2420, true );
         }

+#if wxUSE_LIBJPEG
+    if (colorized_horse_jpeg)
+    {
+        dc.DrawText( _T("Colorize image by rotating green hue to red"), 30, 2490 );
+        dc.DrawBitmap( *colorized_horse_jpeg, 30, 2520 );
+    }
+#endif // wxUSE_LIBJPEG
+

 }
 
 void MyCanvas::CreateAntiAliasedBitmap()
 }
 
 void MyCanvas::CreateAntiAliasedBitmap()


@@ -868,10 +919,10 @@ void MyCanvas::CreateAntiAliasedBitmap()
 
 enum
 {
 
 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 )
 };
 
 IMPLEMENT_DYNAMIC_CLASS( MyFrame, wxFrame )


@@ -925,8 +976,8 @@ MyFrame::MyFrame()
 
   m_canvas = new MyCanvas( this, wxID_ANY, wxPoint(0,0), wxSize(10,10) );
 
 
   m_canvas = new MyCanvas( this, wxID_ANY, wxPoint(0,0), wxSize(10,10) );
 

-  // 500 width * 2500 height
-  m_canvas->SetScrollbars( 10, 10, 50, 250 );
+  // 500 width * 2750 height
+  m_canvas->SetScrollbars( 10, 10, 50, 275 );

 }
 
 void MyFrame::OnQuit( wxCommandEvent &WXUNUSED(event) )
 }
 
 void MyFrame::OnQuit( wxCommandEvent &WXUNUSED(event) )


@@ -943,6 +994,7 @@ void MyFrame::OnAbout( wxCommandEvent &WXUNUSED(event) )
 
 void MyFrame::OnNewFrame( wxCommandEvent &WXUNUSED(event) )
 {
 
 void MyFrame::OnNewFrame( wxCommandEvent &WXUNUSED(event) )
 {

+#if wxUSE_FILEDLG

     wxString filename = wxFileSelector(_T("Select image file"));
     if ( !filename )
         return;
     wxString filename = wxFileSelector(_T("Select image file"));
     if ( !filename )
         return;


@@ -956,6 +1008,7 @@ void MyFrame::OnNewFrame( wxCommandEvent &WXUNUSED(event) )
     }
 
     (new MyImageFrame(this, wxBitmap(image)))->Show();
     }
 
     (new MyImageFrame(this, wxBitmap(image)))->Show();

+#endif // wxUSE_FILEDLG

 }
 
 #ifdef wxHAVE_RAW_BITMAP
 }
 
 #ifdef wxHAVE_RAW_BITMAP


@@ -1047,4 +1100,3 @@ bool MyApp::OnInit()
 
   return true;
 }
 
   return true;
 }

-