more warning fixes about empty if statement in helper classes in release build

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

diff --git a/samples/image/image.cpp b/samples/image/image.cpp
index e52c7e6c08790c3ef9cf33c6f9bd147274a223b8..9a3ac09a0134980ffbd3af6826d8bc571fc5be5c 100644 (file)
--- a/samples/image/image.cpp
+++ b/samples/image/image.cpp
@@ -302,28 +302,31 @@ public:
 
     MyRawBitmapFrame(wxFrame *parent)
         : wxFrame(parent, wxID_ANY, _T("Raw bitmaps (how exciting)")),
 
     MyRawBitmapFrame(wxFrame *parent)
         : wxFrame(parent, wxID_ANY, _T("Raw bitmaps (how exciting)")),

-          m_bitmap(SIZE, SIZE, 32)
+          m_bitmap(SIZE, SIZE, 24),
+          m_alphaBitmap(SIZE, SIZE, 32)

     {
     {

-        SetClientSize(SIZE, SIZE);
+        SetClientSize(SIZE, SIZE*2+25);

 
 

-        // another possibility: wxNativePixelData (don't forget to remove code
-        // setting alpha in the loop below then)
-        typedef wxAlphaPixelData Data;
-        // typedef wxNativePixelData Data;
+        InitAlphaBitmap();
+        InitBitmap();

 
 

+    }
+
+    void InitAlphaBitmap()
+    {

         // First, clear the whole bitmap by making it alpha
         {
         // First, clear the whole bitmap by making it alpha
         {

-            Data data( m_bitmap, wxPoint(0,0), wxSize(SIZE, SIZE) );
+            wxAlphaPixelData data( m_alphaBitmap, wxPoint(0,0), wxSize(SIZE, SIZE) );

             if ( !data )
             {
                 wxLogError(_T("Failed to gain raw access to bitmap data"));
                 return;
             }
             data.UseAlpha();
             if ( !data )
             {
                 wxLogError(_T("Failed to gain raw access to bitmap data"));
                 return;
             }
             data.UseAlpha();

-            Data::Iterator p(data);
+            wxAlphaPixelData::Iterator p(data);

             for ( int y = 0; y < SIZE; ++y )
             {
             for ( int y = 0; y < SIZE; ++y )
             {

-                Data::Iterator rowStart = p;
+                wxAlphaPixelData::Iterator rowStart = p;

                 for ( int x = 0; x < SIZE; ++x )
                 {
                     p.Alpha() = 0;
                 for ( int x = 0; x < SIZE; ++x )
                 {
                     p.Alpha() = 0;


@@ -335,7 +338,8 @@ public:
         }
 
         // Then, draw colourful alpha-blended stripes
         }
 
         // Then, draw colourful alpha-blended stripes

-        Data data(m_bitmap, wxPoint(BORDER, BORDER) , wxSize(REAL_SIZE, REAL_SIZE));
+        wxAlphaPixelData data(m_alphaBitmap, wxPoint(BORDER, BORDER),
+                              wxSize(REAL_SIZE, REAL_SIZE));

         if ( !data )
         {
             wxLogError(_T("Failed to gain raw access to bitmap data"));
         if ( !data )
         {
             wxLogError(_T("Failed to gain raw access to bitmap data"));


@@ -343,12 +347,11 @@ public:
         }
 
         data.UseAlpha();
         }
 
         data.UseAlpha();

-
-        Data::Iterator p(data);
+        wxAlphaPixelData::Iterator p(data);

 
         for ( int y = 0; y < REAL_SIZE; ++y )
         {
 
         for ( int y = 0; y < REAL_SIZE; ++y )
         {

-            Data::Iterator rowStart = p;
+            wxAlphaPixelData::Iterator rowStart = p;

 
             int r = y < REAL_SIZE/3 ? 255 : 0,
                 g = (REAL_SIZE/3 <= y) && (y < 2*(REAL_SIZE/3)) ? 255 : 0,
 
             int r = y < REAL_SIZE/3 ? 255 : 0,
                 g = (REAL_SIZE/3 <= y) && (y < 2*(REAL_SIZE/3)) ? 255 : 0,


@@ -357,7 +360,7 @@ public:
             for ( int x = 0; x < REAL_SIZE; ++x )
             {
                 // note that RGB must be premultiplied by alpha
             for ( int x = 0; x < REAL_SIZE; ++x )
             {
                 // note that RGB must be premultiplied by alpha

-                unsigned a = (Data::Iterator::ChannelType)((x*255.)/REAL_SIZE);
+                unsigned a = (wxAlphaPixelData::Iterator::ChannelType)((x*255.)/REAL_SIZE);

                 p.Red() = r * a / 256;
                 p.Green() = g * a / 256;
                 p.Blue() = b * a / 256;
                 p.Red() = r * a / 256;
                 p.Green() = g * a / 256;
                 p.Blue() = b * a / 256;


@@ -371,17 +374,53 @@ public:
         }
     }
 
         }
     }
 

+    void InitBitmap()
+    {
+        // draw some colourful stripes without alpha
+        wxNativePixelData data(m_bitmap);
+        if ( !data )
+        {
+            wxLogError(_T("Failed to gain raw access to bitmap data"));
+            return;
+        }
+
+        wxNativePixelData::Iterator p(data);
+        for ( int y = 0; y < SIZE; ++y )
+        {
+            wxNativePixelData::Iterator rowStart = p;
+
+            int r = y < SIZE/3 ? 255 : 0,
+                g = (SIZE/3 <= y) && (y < 2*(SIZE/3)) ? 255 : 0,
+                b = 2*(SIZE/3) <= y ? 255 : 0;
+
+            for ( int x = 0; x < SIZE; ++x )
+            {
+                p.Red() = r;
+                p.Green() = g;
+                p.Blue() = b;
+                ++p; // same as p.OffsetX(1)
+            }
+
+            p = rowStart;
+            p.OffsetY(data, 1);
+        }
+    }
+

     void OnPaint(wxPaintEvent& WXUNUSED(event))
     {
         wxPaintDC dc( this );
         dc.DrawText(_T("This is alpha and raw bitmap test"), 0, BORDER);
         dc.DrawText(_T("This is alpha and raw bitmap test"), 0, SIZE/2 - BORDER);
         dc.DrawText(_T("This is alpha and raw bitmap test"), 0, SIZE - 2*BORDER);
     void OnPaint(wxPaintEvent& WXUNUSED(event))
     {
         wxPaintDC dc( this );
         dc.DrawText(_T("This is alpha and raw bitmap test"), 0, BORDER);
         dc.DrawText(_T("This is alpha and raw bitmap test"), 0, SIZE/2 - BORDER);
         dc.DrawText(_T("This is alpha and raw bitmap test"), 0, SIZE - 2*BORDER);

-        dc.DrawBitmap( m_bitmap, 0, 0, true /* use mask */ );
+        dc.DrawBitmap( m_alphaBitmap, 0, 0, true /* use mask */ );
+
+        dc.DrawText(_T("Raw bitmap access without alpha"), 0, SIZE+5);
+        dc.DrawBitmap( m_bitmap, 0, SIZE+5+dc.GetCharHeight());

     }
 
 private:
     wxBitmap m_bitmap;
     }
 
 private:
     wxBitmap m_bitmap;

+    wxBitmap m_alphaBitmap;

 
     DECLARE_EVENT_TABLE()
 };
 
     DECLARE_EVENT_TABLE()
 };


@@ -746,24 +785,24 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) )
         int x = 750, y = 10, yy = 170;
 
         dc.DrawText(wxT("Original toucan"), x+50, y);
         int x = 750, y = 10, yy = 170;
 
         dc.DrawText(wxT("Original toucan"), x+50, y);

-        dc.DrawBitmap(my_toucan, x, y+15);
+        dc.DrawBitmap(my_toucan, x, y+15, true);

         y += yy;
         dc.DrawText(wxT("Flipped horizontally"), x+50, y);
         y += yy;
         dc.DrawText(wxT("Flipped horizontally"), x+50, y);

-        dc.DrawBitmap(my_toucan_flipped_horiz, x, y+15);
+        dc.DrawBitmap(my_toucan_flipped_horiz, x, y+15, true);

         y += yy;
         dc.DrawText(wxT("Flipped vertically"), x+50, y);
         y += yy;
         dc.DrawText(wxT("Flipped vertically"), x+50, y);

-        dc.DrawBitmap(my_toucan_flipped_vert, x, y+15);
+        dc.DrawBitmap(my_toucan_flipped_vert, x, y+15, true);

         y += yy;
         dc.DrawText(wxT("Flipped both h&v"), x+50, y);
         y += yy;
         dc.DrawText(wxT("Flipped both h&v"), x+50, y);

-        dc.DrawBitmap(my_toucan_flipped_both, x, y+15);
+        dc.DrawBitmap(my_toucan_flipped_both, x, y+15, true);

 
         y += yy;
         dc.DrawText(wxT("In greyscale"), x+50, y);
 
         y += yy;
         dc.DrawText(wxT("In greyscale"), x+50, y);

-        dc.DrawBitmap(my_toucan_grey, x, y+15);
+        dc.DrawBitmap(my_toucan_grey, x, y+15, true);

 
         y += yy;
         dc.DrawText(wxT("Toucan's head"), x+50, y);
 
         y += yy;
         dc.DrawText(wxT("Toucan's head"), x+50, y);

-        dc.DrawBitmap(my_toucan_head, x, y+15);
+        dc.DrawBitmap(my_toucan_head, x, y+15, true);

     }
 
     if (my_smile_xbm.Ok())
     }
 
     if (my_smile_xbm.Ok())