Second try at doing Set/GetClient right

[wxWidgets.git] / src / common / image.cpp

diff --git a/src/common/image.cpp b/src/common/image.cpp
index dae0abc86cda7db4ab3c4341d215669ed68b3f51..f57881dcb660f2bc3a2941f0a8047f453272220e 100644 (file)
--- a/src/common/image.cpp
+++ b/src/common/image.cpp
@@ -11,10 +11,18 @@
 #pragma implementation "image.h"
 #endif
 
 #pragma implementation "image.h"
 #endif
 

+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+#pragma hdrstop
+#endif
+

 #include "wx/image.h"
 #include "wx/debug.h"
 #include "wx/log.h"
 #include "../png/png.h"
 #include "wx/image.h"
 #include "wx/debug.h"
 #include "wx/log.h"
 #include "../png/png.h"

+#include "wx/filefn.h"

 
 //-----------------------------------------------------------------------------
 // wxImage
 
 //-----------------------------------------------------------------------------
 // wxImage


@@ -22,34 +30,34 @@
 
 class wxImageRefData: public wxObjectRefData
 {
 
 class wxImageRefData: public wxObjectRefData
 {

-  public:
-  
-    wxImageRefData(void);
-    ~wxImageRefData(void);
+
+public:
+  wxImageRefData(void);
+  ~wxImageRefData(void);

   
   

-    int             m_width;
-    int             m_height;
-    unsigned char  *m_data;
-    bool            m_hasMask;
-    unsigned char   m_maskRed,m_maskGreen,m_maskBlue;
-    bool            m_ok;
+  int             m_width;
+  int             m_height;
+  unsigned char  *m_data;
+  bool            m_hasMask;
+  unsigned char   m_maskRed,m_maskGreen,m_maskBlue;
+  bool            m_ok;

 };
 
 wxImageRefData::wxImageRefData(void)
 {
 };
 
 wxImageRefData::wxImageRefData(void)
 {

-  m_width = 0;
-  m_height = 0;
-  m_data = (unsigned char*) NULL;
-  m_ok = FALSE;
-  m_maskRed = 0;
-  m_maskGreen = 0;
-  m_maskBlue = 0;
-  m_hasMask = FALSE;
+    m_width = 0;
+    m_height = 0;
+    m_data = (unsigned char*) NULL;
+    m_ok = FALSE;
+    m_maskRed = 0;
+    m_maskGreen = 0;
+    m_maskBlue = 0;
+    m_hasMask = FALSE;

 }
 
 wxImageRefData::~wxImageRefData(void)
 {
 }
 
 wxImageRefData::~wxImageRefData(void)
 {

-  if (m_data) free( m_data );
+    if (m_data) free( m_data );

 }
 
 wxList wxImage::sm_handlers;
 }
 
 wxList wxImage::sm_handlers;


@@ -68,58 +76,58 @@ wxImage::wxImage()
 
 wxImage::wxImage( int width, int height )
 {
 
 wxImage::wxImage( int width, int height )
 {

-  Create( width, height );
+    Create( width, height );

 }
 
 wxImage::wxImage( const wxString& name, long type )
 {
 }
 
 wxImage::wxImage( const wxString& name, long type )
 {

-  LoadFile( name, type );
+    LoadFile( name, type );

 }
 
 wxImage::wxImage( const wxImage& image )  
 {  
 }
 
 wxImage::wxImage( const wxImage& image )  
 {  

-  Ref(image); 
+    Ref(image); 

 }
 
 wxImage::wxImage( const wxImage* image )  
 { 
 }
 
 wxImage::wxImage( const wxImage* image )  
 { 

-  if (image) Ref(*image); 
+    if (image) Ref(*image); 

 }
 
 void wxImage::Create( int width, int height )
 {
 }
 
 void wxImage::Create( int width, int height )
 {

-  m_refData = new wxImageRefData();
+    m_refData = new wxImageRefData();

   
   

-  M_IMGDATA->m_data = (unsigned char *) malloc( width*height*3 );
-  if (M_IMGDATA->m_data)
-  {
-    for (int l = 0; l < width*height*3; l++) M_IMGDATA->m_data[l] = 0;
+    M_IMGDATA->m_data = (unsigned char *) malloc( width*height*3 );
+    if (M_IMGDATA->m_data)
+    {
+        for (int l = 0; l < width*height*3; l++) M_IMGDATA->m_data[l] = 0;

   
   

-    M_IMGDATA->m_width = width;
-    M_IMGDATA->m_height = height;
-    M_IMGDATA->m_ok = TRUE;
-  }
-  else
-  {
-    UnRef();
-  }
+        M_IMGDATA->m_width = width;
+        M_IMGDATA->m_height = height;
+        M_IMGDATA->m_ok = TRUE;
+    }
+    else
+    {
+        UnRef();
+    }

 }
 
 void wxImage::Destroy()
 {
 }
 
 void wxImage::Destroy()
 {

-  UnRef();
+    UnRef();

 }
 
 bool wxImage::Ok() const 
 { 
 }
 
 bool wxImage::Ok() const 
 { 

-  return (M_IMGDATA && M_IMGDATA->m_ok); 
+    return (M_IMGDATA && M_IMGDATA->m_ok); 

 }
 
 char unsigned *wxImage::GetData() const
 {
 }
 
 char unsigned *wxImage::GetData() const
 {

-  if (!Ok()) return (char unsigned *)NULL;
+    if (!Ok()) return (char unsigned *)NULL;

   
   

-  return M_IMGDATA->m_data;
+    return M_IMGDATA->m_data;

 }
 
 void wxImage::SetData( char unsigned *WXUNUSED(data) )
 }
 
 void wxImage::SetData( char unsigned *WXUNUSED(data) )


@@ -128,89 +136,96 @@ void wxImage::SetData( char unsigned *WXUNUSED(data) )
 
 void wxImage::SetMaskColour( unsigned char r, unsigned char g, unsigned char b )
 {
 
 void wxImage::SetMaskColour( unsigned char r, unsigned char g, unsigned char b )
 {

-  if (!Ok()) return;
+    if (!Ok()) return;

   
   

-  M_IMGDATA->m_maskRed = r;
-  M_IMGDATA->m_maskGreen = g;
-  M_IMGDATA->m_maskBlue = b;
-  M_IMGDATA->m_hasMask = TRUE;
+    M_IMGDATA->m_maskRed = r;
+    M_IMGDATA->m_maskGreen = g;
+    M_IMGDATA->m_maskBlue = b;
+    M_IMGDATA->m_hasMask = TRUE;

 }
 
 unsigned char wxImage::GetMaskRed() const
 {
 }
 
 unsigned char wxImage::GetMaskRed() const
 {

-  if (!Ok()) return 0;
+    if (!Ok()) return 0;

   
   

-  return M_IMGDATA->m_maskRed;
+    return M_IMGDATA->m_maskRed;

 }
 
 unsigned char wxImage::GetMaskGreen() const
 {
 }
 
 unsigned char wxImage::GetMaskGreen() const
 {

-  if (!Ok()) return 0;
-  
-  return M_IMGDATA->m_maskGreen;
+    if (!Ok()) return 0;
+   
+    return M_IMGDATA->m_maskGreen;

 }
 
 unsigned char wxImage::GetMaskBlue() const
 {
 }
 
 unsigned char wxImage::GetMaskBlue() const
 {

-  if (!Ok()) return 0;
+    if (!Ok()) return 0;

   
   

-  return M_IMGDATA->m_maskBlue;
+    return M_IMGDATA->m_maskBlue;

 }
   
 void wxImage::SetMask( bool mask )
 {
 }
   
 void wxImage::SetMask( bool mask )
 {

-  if (!Ok()) return;
+    if (!Ok()) return;

   
   

-  M_IMGDATA->m_hasMask = mask;
+    M_IMGDATA->m_hasMask = mask;

 }
 
 bool wxImage::HasMask() const
 {
 }
 
 bool wxImage::HasMask() const
 {

-  if (!Ok()) return FALSE;
+    if (!Ok()) return FALSE;

   
   

-  return M_IMGDATA->m_hasMask;
+    return M_IMGDATA->m_hasMask;

 }
 
 int wxImage::GetWidth() const 
 { 
 }
 
 int wxImage::GetWidth() const 
 { 

-  return (M_IMGDATA ? M_IMGDATA->m_width : 0); 
+    return (M_IMGDATA ? M_IMGDATA->m_width : 0); 

 }
 
 int wxImage::GetHeight() const 
 { 
 }
 
 int wxImage::GetHeight() const 
 { 

-  return (M_IMGDATA ? M_IMGDATA->m_height : 0); 
+    return (M_IMGDATA ? M_IMGDATA->m_height : 0); 

 }
 
 bool wxImage::LoadFile( const wxString& filename, long type )
 {
 }
 
 bool wxImage::LoadFile( const wxString& filename, long type )
 {

-  UnRef();
+    UnRef();
+  
+    if (!wxFileExists(filename))
+    {
+        wxLogWarning( "Image file does not exist." );

 
 

-  m_refData = new wxImageRefData;
+        return FALSE;
+    }

 
 

-  wxImageHandler *handler = FindHandler(type);
+    m_refData = new wxImageRefData;

 
 

-  if (handler == NULL) 
-  {
-    wxLogWarning( "No image handler for type %d defined.", type );
+    wxImageHandler *handler = FindHandler(type);

 
 

-    return FALSE;
-  }
+    if (handler == NULL) 
+    {
+        wxLogWarning( "No image handler for type %d defined.", type );
+
+        return FALSE;
+    }

 
 

-  return handler->LoadFile( this, filename );
+    return handler->LoadFile( this, filename );

 }
 
 bool wxImage::SaveFile( const wxString& filename, int type )
 {
 }
 
 bool wxImage::SaveFile( const wxString& filename, int type )
 {

-  wxImageHandler *handler = FindHandler(type);
+    wxImageHandler *handler = FindHandler(type);

 
 

-  if (handler == NULL) 
-  {
-    wxLogWarning( "No image handler for type %d defined.", type );
+    if (handler == NULL) 
+    {
+      wxLogWarning( "No image handler for type %d defined.", type );

 
 

-    return FALSE;
-  }
+      return FALSE;
+    }

 
 

-  return handler->SaveFile( this, filename );
+    return handler->SaveFile( this, filename );

 }
 
 void wxImage::AddHandler( wxImageHandler *handler )
 }
 
 void wxImage::AddHandler( wxImageHandler *handler )


@@ -225,65 +240,71 @@ void wxImage::InsertHandler( wxImageHandler *handler )
 
 bool wxImage::RemoveHandler( const wxString& name )
 {
 
 bool wxImage::RemoveHandler( const wxString& name )
 {

-  wxImageHandler *handler = FindHandler(name);
-  if (handler)
-  {
-    sm_handlers.DeleteObject(handler);
-    return TRUE;
-  }
-  else
-    return FALSE;
+    wxImageHandler *handler = FindHandler(name);
+    if (handler)
+    {
+        sm_handlers.DeleteObject(handler);
+        return TRUE;
+    }
+    else
+        return FALSE;

 }
 
 wxImageHandler *wxImage::FindHandler( const wxString& name )
 {
 }
 
 wxImageHandler *wxImage::FindHandler( const wxString& name )
 {

-  wxNode *node = sm_handlers.First();
-  while (node)
-  {
-    wxImageHandler *handler = (wxImageHandler*)node->Data();
-    if (handler->GetName() == name) return handler;
-    node = node->Next();
-  }
-  return (wxImageHandler *)NULL;
+    wxNode *node = sm_handlers.First();
+    while (node)
+    {
+        wxImageHandler *handler = (wxImageHandler*)node->Data();
+        if (handler->GetName() == name) return handler;
+        node = node->Next();
+    }
+    return (wxImageHandler *)NULL;

 }
 
 wxImageHandler *wxImage::FindHandler( const wxString& extension, long bitmapType )
 {
 }
 
 wxImageHandler *wxImage::FindHandler( const wxString& extension, long bitmapType )
 {

-  wxNode *node = sm_handlers.First();
-  while (node)
-  {
-    wxImageHandler *handler = (wxImageHandler*)node->Data();
-    if ( handler->GetExtension() == extension &&
-        (bitmapType == -1 || handler->GetType() == bitmapType) )
-      return handler;
-    node = node->Next();
-  }
-  return (wxImageHandler*)NULL;
+    wxNode *node = sm_handlers.First();
+    while (node)
+    {
+        wxImageHandler *handler = (wxImageHandler*)node->Data();
+        if ( handler->GetExtension() == extension &&
+            (bitmapType == -1 || handler->GetType() == bitmapType) )
+        return handler;
+        node = node->Next();
+    }
+    return (wxImageHandler*)NULL;

 }
 
 wxImageHandler *wxImage::FindHandler( long bitmapType )
 {
 }
 
 wxImageHandler *wxImage::FindHandler( long bitmapType )
 {

-  wxNode *node = sm_handlers.First();
-  while (node)
-  {
-    wxImageHandler *handler = (wxImageHandler *)node->Data();
-    if (handler->GetType() == bitmapType) return handler;
-    node = node->Next();
-  }
-  return NULL;
+    wxNode *node = sm_handlers.First();
+    while (node)
+    {
+        wxImageHandler *handler = (wxImageHandler *)node->Data();
+        if (handler->GetType() == bitmapType) return handler;
+        node = node->Next();
+    }
+    return NULL;
+}
+
+void wxImage::InitStandardHandlers()
+{
+    AddHandler( new wxBMPHandler );
+    AddHandler( new wxPNGHandler );

 }
 
 void wxImage::CleanUpHandlers()
 {
 }
 
 void wxImage::CleanUpHandlers()
 {

-  wxNode *node = sm_handlers.First();
-  while (node)
-  {
-    wxImageHandler *handler = (wxImageHandler *)node->Data();
-    wxNode *next = node->Next();
-    delete handler;
-    delete node;
-    node = next;
-  }
+    wxNode *node = sm_handlers.First();
+    while (node)
+    {
+        wxImageHandler *handler = (wxImageHandler *)node->Data();
+        wxNode *next = node->Next();
+        delete handler;
+        delete node;
+        node = next;
+    }

 }
 
 //-----------------------------------------------------------------------------
 }
 
 //-----------------------------------------------------------------------------


@@ -296,12 +317,12 @@ IMPLEMENT_DYNAMIC_CLASS(wxImageHandler,wxObject)
 
 bool wxImageHandler::LoadFile( wxImage *WXUNUSED(image), const wxString& WXUNUSED(name) )
 {
 
 bool wxImageHandler::LoadFile( wxImage *WXUNUSED(image), const wxString& WXUNUSED(name) )
 {

-  return FALSE;
+    return FALSE;

 }
 
 bool wxImageHandler::SaveFile( wxImage *WXUNUSED(image), const wxString& WXUNUSED(name) )
 {
 }
 
 bool wxImageHandler::SaveFile( wxImage *WXUNUSED(image), const wxString& WXUNUSED(name) )
 {

-  return FALSE;
+    return FALSE;

 }
 
 //-----------------------------------------------------------------------------
 }
 
 //-----------------------------------------------------------------------------


@@ -320,6 +341,7 @@ bool wxPNGHandler::LoadFile( wxImage *image, const wxString& name )
    unsigned char      *ptr, **lines, *ptr2;
    int                 transp,bit_depth,color_type,interlace_type;
    png_uint_32         width, height;
    unsigned char      *ptr, **lines, *ptr2;
    int                 transp,bit_depth,color_type,interlace_type;
    png_uint_32         width, height;

+   unsigned int               i;

 
    image->Destroy();
    
 
    image->Destroy();
    


@@ -375,7 +397,7 @@ bool wxPNGHandler::LoadFile( wxImage *image, const wxString& name )
      return FALSE;
    }
    
      return FALSE;
    }
    

-   for (unsigned int i = 0; i < height; i++)
+   for (i = 0; i < height; i++)

    {
      if ((lines[i] = (unsigned char *)malloc(width * (sizeof(unsigned char) * 4))) == NULL)
      {
    {
      if ((lines[i] = (unsigned char *)malloc(width * (sizeof(unsigned char) * 4))) == NULL)
      {


@@ -444,7 +466,7 @@ bool wxPNGHandler::LoadFile( wxImage *image, const wxString& name )
               }
          }
      }
               }
          }
      }

-   for (unsigned int i = 0; i < height; i++) free( lines[i] );
+   for (i = 0; i < height; i++) free( lines[i] );

    free( lines );
    if (transp)
      image->SetMaskColour( 255, 0, 255 );
    free( lines );
    if (transp)
      image->SetMaskColour( 255, 0, 255 );


@@ -556,11 +578,12 @@ bool wxBMPHandler::LoadFile( wxImage *image, const wxString& name )
        unsigned char       r, g, b;
      }
                       *cmap = NULL;
        unsigned char       r, g, b;
      }
                       *cmap = NULL;

-
+#ifndef BI_RGB

 #define BI_RGB       0
 #define BI_RLE8      1
 #define BI_RLE4      2
 #define BI_BITFIELDS 3
 #define BI_RGB       0
 #define BI_RLE8      1
 #define BI_RLE4      2
 #define BI_BITFIELDS 3

+#endif

 
   image->Destroy();
 
 
   image->Destroy();