X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fmodules%2Fmod_bmp%2Fmptr_bmp.cpp;h=9151cfe8ce2b18d6284fa2cba5306212647dfea2;hb=9459638ad6797b8139f1e9f0715c96076dbf0890;hp=e85e8d6881016e586e66855c6944bdfb5312d9f2;hpb=16b3beced25134bef064705568ecb893a6be4e79;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 e85e8d6..9151cfe 100644 --- a/synfig-core/trunk/src/modules/mod_bmp/mptr_bmp.cpp +++ b/synfig-core/trunk/src/modules/mod_bmp/mptr_bmp.cpp @@ -1,18 +1,22 @@ -/*! ======================================================================== -** Sinfg -** bmp Target Module -** $Id: mptr_bmp.cpp,v 1.1.1.1 2005/01/04 01:23:10 darco Exp $ +/* === S Y N F I G ========================================================= */ +/*! \file mptr_bmp.cpp +** \brief bmp Target Module ** -** Copyright (c) 2002 Robert B. Quattlebaum Jr. +** $Id$ ** -** This software and associated documentation -** are CONFIDENTIAL and PROPRIETARY property of -** the above-mentioned copyright holder. +** \legal +** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley ** -** You may not copy, print, publish, or in any -** other way distribute this software without -** a prior written agreement with -** the copyright holder. +** This package is free software; you can redistribute it and/or +** modify it under the terms of the GNU General Public License as +** published by the Free Software Foundation; either version 2 of +** the License, or (at your option) any later version. +** +** This package is distributed in the hope that it will be useful, +** but WITHOUT ANY WARRANTY; without even the implied warranty of +** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +** General Public License for more details. +** \endlegal ** ** === N O T E S =========================================================== ** @@ -20,7 +24,7 @@ /* === H E A D E R S ======================================================= */ -#define SINFG_NO_ANGLE +#define SYNFIG_NO_ANGLE #ifdef USING_PCH # include "pch.h" @@ -30,8 +34,8 @@ #endif #include "mptr_bmp.h" -#include -#include +#include +#include #include #include @@ -39,19 +43,20 @@ /* === U S I N G =========================================================== */ -using namespace sinfg; +using namespace synfig; using namespace std; using namespace etl; /* === G L O B A L S ======================================================= */ -SINFG_IMPORTER_INIT(bmp_mptr); -SINFG_IMPORTER_SET_NAME(bmp_mptr,"bmp_mptr"); -SINFG_IMPORTER_SET_EXT(bmp_mptr,"bmp"); -SINFG_IMPORTER_SET_VERSION(bmp_mptr,"0.1"); -SINFG_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_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$"); /* === M E T H O D S ======================================================= */ +namespace synfig { struct BITMAPFILEHEADER { @@ -77,6 +82,8 @@ struct BITMAPINFOHEADER unsigned long biClrImportant; }; +} + #ifdef WORDS_BIGENDIAN inline long little_endian(const long &x) { @@ -118,86 +125,86 @@ bmp_mptr::~bmp_mptr() } bool -bmp_mptr::get_frame(sinfg::Surface &surface,Time, sinfg::ProgressCallback *cb) +bmp_mptr::get_frame(synfig::Surface &surface,Time /*time*/, synfig::ProgressCallback *cb) { FILE *file=fopen(filename.c_str(),"rb"); if(!file) { - if(cb)cb->error("bmp_mptr::GetFrame(): "+strprintf(_("Unable to open %s"),filename.c_str())); - else sinfg::error("bmp_mptr::GetFrame(): "+strprintf(_("Unable to open %s"),filename.c_str())); + if(cb)cb->error("bmp_mptr::GetFrame(): "+strprintf(_("Unable to open %s"),filename.c_str())); + else synfig::error("bmp_mptr::GetFrame(): "+strprintf(_("Unable to open %s"),filename.c_str())); return false; } - BITMAPFILEHEADER fileheader; - BITMAPINFOHEADER infoheader; + synfig::BITMAPFILEHEADER fileheader; + synfig::BITMAPINFOHEADER infoheader; char b_char=fgetc(file); char m_char=fgetc(file); - + if(b_char!='B' || m_char!='M') { - if(cb)cb->error("bmp_mptr::GetFrame(): "+strprintf(_("%s is not in BMP format"),filename.c_str())); - else sinfg::error("bmp_mptr::GetFrame(): "+strprintf(_("%s is not in BMP format"),filename.c_str())); + if(cb)cb->error("bmp_mptr::GetFrame(): "+strprintf(_("%s is not in BMP format"),filename.c_str())); + else synfig::error("bmp_mptr::GetFrame(): "+strprintf(_("%s is not in BMP format"),filename.c_str())); 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); - else sinfg::error(str); + String str("bmp_mptr::get_frame(): "+strprintf(_("Failure while reading BITMAPFILEHEADER from %s"),filename.c_str())); + if(cb)cb->error(str); + else synfig::error(str); 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); - else sinfg::error(str); + String str("bmp_mptr::get_frame(): "+strprintf(_("Failure while reading BITMAPINFOHEADER from %s"),filename.c_str())); + if(cb)cb->error(str); + else synfig::error(str); return false; } - + 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)); - if(cb)cb->error(str); - else sinfg::error(str); + 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; } if(little_endian(infoheader.biSize)!=little_endian(40)) { - String str("bmp_mptr::get_frame(): "+strprintf(_("Bad BITMAPINFOHEADER in %s. (biSize=%d, should be 40)"),filename.c_str(),little_endian(infoheader.biSize))); - if(cb)cb->error(str); - else sinfg::error(str); + String str("bmp_mptr::get_frame(): "+strprintf(_("Bad BITMAPINFOHEADER in %s. (biSize=%d, should be 40)"),filename.c_str(),little_endian(infoheader.biSize))); + if(cb)cb->error(str); + else synfig::error(str); return false; } - + int w,h,bit_count; w=little_endian(infoheader.biWidth); h=little_endian(infoheader.biHeight); bit_count=little_endian_short(infoheader.biBitCount); - - sinfg::warning("w:%d\n",w); - sinfg::warning("h:%d\n",h); - sinfg::warning("bit_count:%d\n",bit_count); - + + synfig::warning("w:%d\n",w); + synfig::warning("h:%d\n",h); + synfig::warning("bit_count:%d\n",bit_count); + if(little_endian(infoheader.biCompression)) { - if(cb)cb->error("bmp_mptr::GetFrame(): "+string(_("Reading compressed bitmaps is not supported"))); - else sinfg::error("bmp_mptr::GetFrame(): "+string(_("Reading compressed bitmaps is not supported"))); + if(cb)cb->error("bmp_mptr::GetFrame(): "+string(_("Reading compressed bitmaps is not supported"))); + else synfig::error("bmp_mptr::GetFrame(): "+string(_("Reading compressed bitmaps is not supported"))); return false; } if(bit_count!=24 && bit_count!=32) { - if(cb)cb->error("bmp_mptr::GetFrame(): "+strprintf(_("Unsupported bit depth (bit_count=%d, should be 24 or 32)"),bit_count)); - else sinfg::error("bmp_mptr::GetFrame(): "+strprintf(_("Unsupported bit depth (bit_count=%d, should be 24 or 32)"),bit_count)); + if(cb)cb->error("bmp_mptr::GetFrame(): "+strprintf(_("Unsupported bit depth (bit_count=%d, should be 24 or 32)"),bit_count)); + else synfig::error("bmp_mptr::GetFrame(): "+strprintf(_("Unsupported bit depth (bit_count=%d, should be 24 or 32)"),bit_count)); return false; } - + int x; int y; surface.set_wh(w,h); @@ -210,7 +217,7 @@ bmp_mptr::get_frame(sinfg::Surface &surface,Time, sinfg::ProgressCallback *cb) float b=gamma().b_U8_to_F32((unsigned char)fgetc(file)); float g=gamma().g_U8_to_F32((unsigned char)fgetc(file)); float r=gamma().r_U8_to_F32((unsigned char)fgetc(file)); - + surface[h-y-1][x]=Color( r, g, @@ -220,8 +227,9 @@ bmp_mptr::get_frame(sinfg::Surface &surface,Time, sinfg::ProgressCallback *cb) if(bit_count==32) fgetc(file); } - - fclose(file); + + fclose(file); return true; } +