X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fmodules%2Fmod_bmp%2Fmptr_bmp.cpp;h=21c8f44871f230eb7b2978f5c4c4189c865e1d30;hb=ca157a87151421913925eaef67fdd402bbdc8c8f;hp=60cf672d7561ee6bf246bd7a0e67304bf794bf8d;hpb=675aca937d23c7f460edf42ac3ec0ffa06205a2c;p=synfig.git

diff --git a/synfig-core/trunk/src/modules/mod_bmp/mptr_bmp.cpp b/synfig-core/trunk/src/modules/mod_bmp/mptr_bmp.cpp
index 60cf672..21c8f44 100644
--- a/synfig-core/trunk/src/modules/mod_bmp/mptr_bmp.cpp
+++ b/synfig-core/trunk/src/modules/mod_bmp/mptr_bmp.cpp
@@ -56,6 +56,7 @@ SYNFIG_IMPORTER_SET_VERSION(bmp_mptr,"0.1");
 SYNFIG_IMPORTER_SET_CVS_ID(bmp_mptr,"$Id$");
 
 /* === M E T H O D S ======================================================= */
+namespace synfig {
 
 struct BITMAPFILEHEADER
 {
@@ -81,6 +82,8 @@ struct BITMAPINFOHEADER
 	unsigned long	biClrImportant;
 };
 
+}
+
 #ifdef WORDS_BIGENDIAN
 inline long little_endian(const long &x)
 {
@@ -122,7 +125,7 @@ bmp_mptr::~bmp_mptr()
 }
 
 bool
-bmp_mptr::get_frame(synfig::Surface &surface,Time time, synfig::ProgressCallback *cb)
+bmp_mptr::get_frame(synfig::Surface &surface,Time /*time*/, synfig::ProgressCallback *cb)
 {
 	FILE *file=fopen(filename.c_str(),"rb");
 	if(!file)
@@ -132,8 +135,8 @@ bmp_mptr::get_frame(synfig::Surface &surface,Time time, synfig::ProgressCallback
 		return false;
 	}
 
-	BITMAPFILEHEADER fileheader;
-	BITMAPINFOHEADER infoheader;
+	synfig::BITMAPFILEHEADER fileheader;
+	synfig::BITMAPINFOHEADER infoheader;
 	char b_char=fgetc(file);
 	char m_char=fgetc(file);
 
@@ -144,7 +147,7 @@ bmp_mptr::get_frame(synfig::Surface &surface,Time time, synfig::ProgressCallback
 		return false;
 	}
 
-	if(fread(&fileheader.bfSize, 1, sizeof(BITMAPFILEHEADER)-4, file)!=sizeof(BITMAPFILEHEADER)-4)
+	if(fread(&fileheader.bfSize, 1, sizeof(synfig::BITMAPFILEHEADER)-4, file)!=sizeof(synfig::BITMAPFILEHEADER)-4)
 	{
 		String str("bmp_mptr::get_frame(): "+strprintf(_("Failure while reading BITMAPFILEHEADER from %s"),filename.c_str()));
 		if(cb)cb->error(str);
@@ -152,7 +155,7 @@ bmp_mptr::get_frame(synfig::Surface &surface,Time time, synfig::ProgressCallback
 		return false;
 	}
 
-	if(fread(&infoheader, 1, sizeof(BITMAPINFOHEADER), file)!=sizeof(BITMAPINFOHEADER))
+	if(fread(&infoheader, 1, sizeof(synfig::BITMAPINFOHEADER), file)!=sizeof(synfig::BITMAPINFOHEADER))
 	{
 		String str("bmp_mptr::get_frame(): "+strprintf(_("Failure while reading BITMAPINFOHEADER from %s"),filename.c_str()));
 		if(cb)cb->error(str);
@@ -162,9 +165,9 @@ bmp_mptr::get_frame(synfig::Surface &surface,Time time, synfig::ProgressCallback
 
 	int offset=little_endian(fileheader.bfOffsetBits);
 
-	if(offset!=sizeof(BITMAPFILEHEADER)+sizeof(BITMAPINFOHEADER)-2)
+	if(offset!=sizeof(synfig::BITMAPFILEHEADER)+sizeof(synfig::BITMAPINFOHEADER)-2)
 	{
-		String str("bmp_mptr::get_frame(): "+strprintf(_("Bad BITMAPFILEHEADER in %s. (bfOffsetBits=%d, should be %d)"),filename.c_str(),offset,sizeof(BITMAPFILEHEADER)+sizeof(BITMAPINFOHEADER)-2));
+		String str("bmp_mptr::get_frame(): "+strprintf(_("Bad BITMAPFILEHEADER in %s. (bfOffsetBits=%d, should be %d)"),filename.c_str(),offset,sizeof(synfig::BITMAPFILEHEADER)+sizeof(synfig::BITMAPINFOHEADER)-2));
 		if(cb)cb->error(str);
 		else synfig::error(str);
 		return false;