fixed hash collisions in ZIP files (patch 1082026)

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

diff --git a/src/common/artprov.cpp b/src/common/artprov.cpp
index 1c18b538ca93d0e1beac7fc89548bd302c612c65..0b8018556ccb48e23c5c77b8839988f54ed46a68 100644 (file)
--- a/src/common/artprov.cpp
+++ b/src/common/artprov.cpp
@@ -13,7 +13,7 @@
 // headers
 // ---------------------------------------------------------------------------
 
 // headers
 // ---------------------------------------------------------------------------
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma implementation "artprov.h"
 #endif
 
     #pragma implementation "artprov.h"
 #endif
 


@@ -32,9 +32,9 @@
 #include "wx/artprov.h"
 #include "wx/hashmap.h"
 #include "wx/module.h"
 #include "wx/artprov.h"
 #include "wx/hashmap.h"
 #include "wx/module.h"

-
-// For the purposes of forcing this module to link
-extern char g_ArtProviderModule;
+#if wxUSE_IMAGE
+#include "wx/image.h"
+#endif

 
 // ===========================================================================
 // implementation
 
 // ===========================================================================
 // implementation


@@ -48,7 +48,7 @@ WX_DEFINE_LIST(wxArtProvidersList);
 // Cache class - stores already requested bitmaps
 // ----------------------------------------------------------------------------
 
 // Cache class - stores already requested bitmaps
 // ----------------------------------------------------------------------------
 

-WX_DECLARE_STRING_HASH_MAP(wxBitmap, wxArtProviderBitmapsHash);
+WX_DECLARE_EXPORTED_STRING_HASH_MAP(wxBitmap, wxArtProviderBitmapsHash);

 
 class WXDLLEXPORT wxArtProviderCache
 {
 
 class WXDLLEXPORT wxArtProviderCache
 {


@@ -58,7 +58,7 @@ public:
         { m_bitmapsHash[full_id] = bmp; }
 
     void Clear();
         { m_bitmapsHash[full_id] = bmp; }
 
     void Clear();

-    
+

     static wxString ConstructHashID(const wxArtID& id,
                                     const wxArtClient& client,
                                     const wxSize& size);
     static wxString ConstructHashID(const wxArtID& id,
                                     const wxArtClient& client,
                                     const wxSize& size);


@@ -72,20 +72,17 @@ bool wxArtProviderCache::GetBitmap(const wxString& full_id, wxBitmap* bmp)
     wxArtProviderBitmapsHash::iterator entry = m_bitmapsHash.find(full_id);
     if ( entry == m_bitmapsHash.end() )
     {
     wxArtProviderBitmapsHash::iterator entry = m_bitmapsHash.find(full_id);
     if ( entry == m_bitmapsHash.end() )
     {

-        return FALSE;
+        return false;

     }
     else
     {
         *bmp = entry->second;
     }
     else
     {
         *bmp = entry->second;

-        return TRUE;
+        return true;

     }
 }
 
 void wxArtProviderCache::Clear()
 {
     }
 }
 
 void wxArtProviderCache::Clear()
 {

-    // Hack to make the default provider link
-    // with the application
-    g_ArtProviderModule = 0;

     m_bitmapsHash.clear();
 }
 
     m_bitmapsHash.clear();
 }
 


@@ -113,38 +110,41 @@ wxArtProviderCache *wxArtProvider::sm_cache = NULL;
     if ( !sm_providers )
     {
         sm_providers = new wxArtProvidersList;
     if ( !sm_providers )
     {
         sm_providers = new wxArtProvidersList;

-        sm_providers->DeleteContents(TRUE);

         sm_cache = new wxArtProviderCache;
     }
 
     sm_providers->Insert(provider);
         sm_cache = new wxArtProviderCache;
     }
 
     sm_providers->Insert(provider);

+    sm_cache->Clear();

 }
 
 /*static*/ bool wxArtProvider::PopProvider()
 {
 }
 
 /*static*/ bool wxArtProvider::PopProvider()
 {

-    wxCHECK_MSG( sm_providers, FALSE, _T("no wxArtProvider exists") );
-    wxCHECK_MSG( sm_providers->GetCount() > 0, FALSE, _T("wxArtProviders stack is empty") );
+    wxCHECK_MSG( sm_providers, false, _T("no wxArtProvider exists") );
+    wxCHECK_MSG( sm_providers->GetCount() > 0, false, _T("wxArtProviders stack is empty") );

 
 

-    sm_providers->DeleteNode(sm_providers->GetFirst());
+    delete sm_providers->GetFirst()->GetData();
+    sm_providers->Erase(sm_providers->GetFirst());

     sm_cache->Clear();
     sm_cache->Clear();

-    return TRUE;
+    return true;

 }
 
 /*static*/ bool wxArtProvider::RemoveProvider(wxArtProvider *provider)
 {
 }
 
 /*static*/ bool wxArtProvider::RemoveProvider(wxArtProvider *provider)
 {

-    wxCHECK_MSG( sm_providers, FALSE, _T("no wxArtProvider exists") );
+    wxCHECK_MSG( sm_providers, false, _T("no wxArtProvider exists") );

 
     if ( sm_providers->DeleteObject(provider) )
     {
 
     if ( sm_providers->DeleteObject(provider) )
     {

+        delete provider;

         sm_cache->Clear();
         sm_cache->Clear();

-        return TRUE;
+        return true;

     }
     }

-    
-    return FALSE;
+
+    return false;

 }
 
 /*static*/ void wxArtProvider::CleanUpProviders()
 {
 }
 
 /*static*/ void wxArtProvider::CleanUpProviders()
 {

+    WX_CLEAR_LIST(wxArtProvidersList, *sm_providers);

     wxDELETE(sm_providers);
     wxDELETE(sm_cache);
 }
     wxDELETE(sm_providers);
     wxDELETE(sm_cache);
 }


@@ -163,13 +163,25 @@ wxArtProviderCache *wxArtProvider::sm_cache = NULL;
     wxBitmap bmp;
     if ( !sm_cache->GetBitmap(hashId, &bmp) )
     {
     wxBitmap bmp;
     if ( !sm_cache->GetBitmap(hashId, &bmp) )
     {

-        for (wxArtProvidersList::Node *node = sm_providers->GetFirst();
+        for (wxArtProvidersList::compatibility_iterator node = sm_providers->GetFirst();

              node; node = node->GetNext())
         {
             bmp = node->GetData()->CreateBitmap(id, client, size);
             if ( bmp.Ok() )
              node; node = node->GetNext())
         {
             bmp = node->GetData()->CreateBitmap(id, client, size);
             if ( bmp.Ok() )

+            {
+#if wxUSE_IMAGE
+                if ( size != wxDefaultSize &&
+                     (bmp.GetWidth() != size.x || bmp.GetHeight() != size.y) )
+                {
+                    wxImage img = bmp.ConvertToImage();
+                    img.Rescale(size.x, size.y);
+                    bmp = wxBitmap(img);
+                }
+#endif

                 break;
                 break;

+            }

         }
         }

+

         sm_cache->PutBitmap(hashId, bmp);
     }
 
         sm_cache->PutBitmap(hashId, bmp);
     }
 


@@ -183,25 +195,28 @@ wxArtProviderCache *wxArtProvider::sm_cache = NULL;
     wxCHECK_MSG( sm_providers, wxNullIcon, _T("no wxArtProvider exists") );
 
     wxBitmap bmp = GetBitmap(id, client, size);
     wxCHECK_MSG( sm_providers, wxNullIcon, _T("no wxArtProvider exists") );
 
     wxBitmap bmp = GetBitmap(id, client, size);

-    if ( bmp.Ok() )
-    {
-        wxIcon icon;
-        icon.CopyFromBitmap(bmp);
-        return icon;
-    }
-    else
-    {
+    if ( !bmp.Ok() )

         return wxNullIcon;
         return wxNullIcon;

-    }
-}

 
 

+    wxIcon icon;
+    icon.CopyFromBitmap(bmp);
+    return icon;
+}

 
 
 class wxArtProviderModule: public wxModule
 {
 public:
 
 
 class wxArtProviderModule: public wxModule
 {
 public:

-    bool OnInit() { return TRUE; }
-    void OnExit() { wxArtProvider::CleanUpProviders(); }
+    bool OnInit()
+    {
+        wxArtProvider::InitStdProvider();
+        wxArtProvider::InitNativeProvider();
+        return true;
+    }
+    void OnExit()
+    {
+        wxArtProvider::CleanUpProviders();
+    }

 
     DECLARE_DYNAMIC_CLASS(wxArtProviderModule)
 };
 
     DECLARE_DYNAMIC_CLASS(wxArtProviderModule)
 };