Remove .gitignore do nothing is ignored.

[synfig.git] / synfig-core / trunk / src / modules / mod_bmp / mptr_bmp.cpp

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 cc86015..9151cfe 100644 (file)
--- a/synfig-core/trunk/src/modules/mod_bmp/mptr_bmp.cpp
+++ b/synfig-core/trunk/src/modules/mod_bmp/mptr_bmp.cpp
@@ -2,6 +2,8 @@
 /*!    \file mptr_bmp.cpp
 **     \brief bmp Target Module
 **
+**     $Id$
+**
 **     \legal
 **     Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
 **
@@ -51,9 +53,10 @@ SYNFIG_IMPORTER_INIT(bmp_mptr);
 SYNFIG_IMPORTER_SET_NAME(bmp_mptr,"bmp");
 SYNFIG_IMPORTER_SET_EXT(bmp_mptr,"bmp");
 SYNFIG_IMPORTER_SET_VERSION(bmp_mptr,"0.1");
-SYNFIG_IMPORTER_SET_CVS_ID(bmp_mptr,"$Id: mptr_bmp.cpp,v 1.1.1.1 2005/01/04 01:23:10 darco Exp $");
+SYNFIG_IMPORTER_SET_CVS_ID(bmp_mptr,"$Id$");
 
 /* === M E T H O D S ======================================================= */
+namespace synfig {
 
 struct BITMAPFILEHEADER
 {
@@ -79,6 +82,8 @@ struct BITMAPINFOHEADER
        unsigned long   biClrImportant;
 };
 
+}
+
 #ifdef WORDS_BIGENDIAN
 inline long little_endian(const long &x)
 {
@@ -120,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)
@@ -130,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);
 
@@ -142,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);
@@ -150,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);
@@ -160,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;
@@ -227,4 +232,4 @@ bmp_mptr::get_frame(synfig::Surface &surface,Time time, synfig::ProgressCallback
        fclose(file);
        return true;
 }
- 
+