3 files changed, 15 insertions, 13 deletions
diff --git a/bitmap.c b/bitmap.c
index 0462d35..a56d909 100644
--- a/bitmap.c
+++ b/bitmap.c
@@ -1,5 +1,5 @@
 /*
- * $Id: bitmap.c,v 1.5 2005/01/26 20:44:18 lordjaxom Exp $
+ * $Id: bitmap.c,v 1.6 2005/01/27 10:53:07 lordjaxom Exp $
  */
 
 #include "bitmap.h"
@@ -70,8 +70,8 @@ cText2SkinBitmap *cText2SkinBitmap::Load(const std::string &Filename, int Alpha,
 	return res;
 }
 
-bool cText2SkinBitmap::Available(const std::string &Filename, int Alpha = 0, int height = 0, 
-	                             int width = 0, int colors = 0)
+bool cText2SkinBitmap::Available(const std::string &Filename, int Alpha, int height, int width, 
+                                 int colors)
 {
 	cText2SkinBitmap *bmp = Load(Filename, Alpha, height, width, colors, true);
 	return bmp != NULL;
diff --git a/bitmap.h b/bitmap.h
index 33d40ad..9a3c53e 100644
--- a/bitmap.h
+++ b/bitmap.h
@@ -1,5 +1,5 @@
 /*
- * $Id: bitmap.h,v 1.4 2005/01/26 20:44:06 lordjaxom Exp $
+ * $Id: bitmap.h,v 1.5 2005/01/27 10:53:07 lordjaxom Exp $
  */
 
 #ifndef VDR_TEXT2SKIN_BITMAP_H
@@ -48,6 +48,14 @@ inline bool tBitmapSpec::operator==(const tBitmapSpec &Src) const
 		&& Colors == Src.Colors;
 }
 
+class cText2SkinBitmap;
+
+template<>
+void cxCache<tBitmapSpec,cText2SkinBitmap*>::Delete(const tBitmapSpec &Key, 
+                                                    cText2SkinBitmap *&Data);
+template<>
+void cxCache<tBitmapSpec,cText2SkinBitmap*>::Reset(cText2SkinBitmap *&Data);
+
 class cText2SkinBitmap {
 private:
 	static cxCache<tBitmapSpec,cText2SkinBitmap*> mCache;
@@ -88,10 +96,4 @@ inline void cText2SkinBitmap::SetColor(int Index, tColor Color) {
 	mBitmaps[mCurrent]->SetColor(Index, Color);
 }
 
-template<>
-void cxCache<tBitmapSpec,cText2SkinBitmap*>::Delete(const tBitmapSpec &Key, 
-                                                    cText2SkinBitmap *&Data);
-template<>
-void cxCache<tBitmapSpec,cText2SkinBitmap*>::Reset(cText2SkinBitmap *&Data);
-
 #endif // VDR_TEXT2SKIN_BITMAP_H
diff --git a/cache.h b/cache.h
index 964dc11..9d4696f 100644
--- a/cache.h
+++ b/cache.h
@@ -1,5 +1,5 @@
 /*
- * $Id: cache.h,v 1.3 2005/01/26 20:43:30 lordjaxom Exp $
+ * $Id: cache.h,v 1.4 2005/01/27 10:53:07 lordjaxom Exp $
  */
 
 #ifndef VDR_TEXT2SKIN_CACHE_HPP
@@ -13,9 +13,9 @@ template<class key_type, class data_type>
 class cxCache {
 private:
 	typedef std::vector<key_type> usage_list;
-	typedef usage_list::iterator usage_iterator;
+	typedef typename usage_list::iterator usage_iterator;
 	typedef std::map<key_type,data_type> item_map;
-	typedef item_map::iterator item_iterator;
+	typedef typename item_map::iterator item_iterator;
 
 	item_map   mItems;
 	usage_list mUsage;