X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fmodules%2Fmod_bmp%2Ftrgt_bmp.cpp;h=2985c5388f1d4b3c4b4f9b68142e407ce9fd6376;hb=9459638ad6797b8139f1e9f0715c96076dbf0890;hp=1a4533911babd0b721f02a4344ab01f44ec7654a;hpb=16b3beced25134bef064705568ecb893a6be4e79;p=synfig.git diff --git a/synfig-core/trunk/src/modules/mod_bmp/trgt_bmp.cpp b/synfig-core/trunk/src/modules/mod_bmp/trgt_bmp.cpp index 1a45339..2985c53 100644 --- a/synfig-core/trunk/src/modules/mod_bmp/trgt_bmp.cpp +++ b/synfig-core/trunk/src/modules/mod_bmp/trgt_bmp.cpp @@ -1,27 +1,29 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file trgt_bmp.cpp ** \brief Bitmap Target ** -** $Id: trgt_bmp.cpp,v 1.1.1.1 2005/01/04 01:23:10 darco Exp $ +** $Id$ ** ** \legal -** Copyright (c) 2002 Robert B. Quattlebaum Jr. +** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley +** Copyright (c) 2007 Chris Moore ** -** This software and associated documentation -** are CONFIDENTIAL and PROPRIETARY property of -** the above-mentioned 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. ** -** 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 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 */ /* ========================================================================= */ /* === H E A D E R S ======================================================= */ -#define SINFG_NO_ANGLE +#define SYNFIG_NO_ANGLE #ifdef USING_PCH # include "pch.h" @@ -31,7 +33,7 @@ #endif #include "trgt_bmp.h" -#include +#include #include #include @@ -40,19 +42,20 @@ /* === U S I N G =========================================================== */ -using namespace sinfg; +using namespace synfig; using namespace std; using namespace etl; /* === I N F O ============================================================= */ -SINFG_TARGET_INIT(bmp); -SINFG_TARGET_SET_NAME(bmp,"bmp"); -SINFG_TARGET_SET_EXT(bmp,"bmp"); -SINFG_TARGET_SET_VERSION(bmp,"0.1"); -SINFG_TARGET_SET_CVS_ID(bmp,"$Id: trgt_bmp.cpp,v 1.1.1.1 2005/01/04 01:23:10 darco Exp $"); +SYNFIG_TARGET_INIT(bmp); +SYNFIG_TARGET_SET_NAME(bmp,"bmp"); +SYNFIG_TARGET_SET_EXT(bmp,"bmp"); +SYNFIG_TARGET_SET_VERSION(bmp,"0.1"); +SYNFIG_TARGET_SET_CVS_ID(bmp,"$Id$"); /* === C L A S S E S & S T R U C T S ======================================= */ +namespace synfig { struct BITMAPFILEHEADER { @@ -78,6 +81,7 @@ struct BITMAPINFOHEADER unsigned long biClrImportant; }; +} /* === M E T H O D S ======================================================= */ #ifdef WORDS_BIGENDIAN @@ -113,6 +117,8 @@ bmp::bmp(const char *Filename) multi_image=false; buffer=0; color_buffer=0; + set_remove_alpha(); + } bmp::~bmp() @@ -128,9 +134,10 @@ bool bmp::set_rend_desc(RendDesc *given_desc) { pf=PF_BGR; - - // Flip the image upside down, + + // Flip the image upside down, // because bitmaps are upside down. + given_desc->set_flags(0); Point tl=given_desc->get_tl(); Point br=given_desc->get_br(); Point::value_type tmp; @@ -139,7 +146,7 @@ bmp::set_rend_desc(RendDesc *given_desc) br[1]=tmp; given_desc->set_tl(tl); given_desc->set_br(br); - + desc=*given_desc; if(desc.get_frame_end()-desc.get_frame_start()>0) { @@ -149,7 +156,7 @@ bmp::set_rend_desc(RendDesc *given_desc) else multi_image=false; - return true; + return true; } void @@ -164,46 +171,42 @@ bmp::end_frame() } bool -bmp::start_frame(sinfg::ProgressCallback *callback) +bmp::start_frame(synfig::ProgressCallback *callback) { int w=desc.get_w(),h=desc.get_h(); - + rowspan=4*((w*(channels(pf)*8)+31)/32); - if(multi_image) { - String - newfilename(filename), - ext(find(filename.begin(),filename.end(),'.'),filename.end()); - newfilename.erase(find(newfilename.begin(),newfilename.end(),'.'),newfilename.end()); - - newfilename+=etl::strprintf("%04d",imagecount)+ext; - file=fopen(newfilename.c_str(),"wb"); + String newfilename(filename_sans_extension(filename) + + etl::strprintf(".%04d",imagecount) + + filename_extension(filename)); + file=fopen(newfilename.c_str(),POPEN_BINARY_WRITE_TYPE); if(callback)callback->task(newfilename+_(" (animated)")); } else { - file=fopen(filename.c_str(),"wb"); + file=fopen(filename.c_str(),POPEN_BINARY_WRITE_TYPE); if(callback)callback->task(filename); } - + if(!file) { if(callback)callback->error(_("Unable to open file")); - else sinfg::error(_("Unable to open file")); + else synfig::error(_("Unable to open file")); return false; } - - BITMAPFILEHEADER fileheader; - BITMAPINFOHEADER infoheader; - + + synfig::BITMAPFILEHEADER fileheader; + synfig::BITMAPINFOHEADER infoheader; + fileheader.bfType[0]='B'; fileheader.bfType[1]='M'; - fileheader.bfSize=little_endian(sizeof(BITMAPFILEHEADER)+sizeof(BITMAPINFOHEADER)+rowspan*h); - fileheader.bfReserved1=0; - fileheader.bfReserved2=0; - fileheader.bfOffsetBits=little_endian(sizeof(BITMAPFILEHEADER)+sizeof(BITMAPINFOHEADER)-2); - + fileheader.bfSize=little_endian(sizeof(synfig::BITMAPFILEHEADER)+sizeof(synfig::BITMAPINFOHEADER)+rowspan*h); + fileheader.bfReserved1=0; + fileheader.bfReserved2=0; + fileheader.bfOffsetBits=little_endian(sizeof(synfig::BITMAPFILEHEADER)+sizeof(synfig::BITMAPINFOHEADER)-2); + infoheader.biSize=little_endian(40); infoheader.biWidth=little_endian(w); infoheader.biHeight=little_endian(h); @@ -215,26 +218,26 @@ bmp::start_frame(sinfg::ProgressCallback *callback) infoheader.biYPelsPerMeter=little_endian((int)rend_desc().get_y_res()); // pels per meter...? infoheader.biClrUsed=little_endian(0); infoheader.biClrImportant=little_endian(0); - + fprintf(file,"BM"); - - if(!fwrite(&fileheader.bfSize,sizeof(BITMAPFILEHEADER)-4,1,file)) + + if(!fwrite(&fileheader.bfSize,sizeof(synfig::BITMAPFILEHEADER)-4,1,file)) { if(callback)callback->error(_("Unable to write file header to file")); - else sinfg::error(_("Unable to write file header to file")); + else synfig::error(_("Unable to write file header to file")); return false; } - if(!fwrite(&infoheader,sizeof(BITMAPINFOHEADER),1,file)) + if(!fwrite(&infoheader,sizeof(synfig::BITMAPINFOHEADER),1,file)) { if(callback)callback->error(_("Unable to write info header")); - else sinfg::error(_("Unable to write info header")); + else synfig::error(_("Unable to write info header")); return false; } delete [] buffer; buffer=new unsigned char[rowspan]; - + delete [] color_buffer; color_buffer=new Color[desc.get_w()]; @@ -242,7 +245,7 @@ bmp::start_frame(sinfg::ProgressCallback *callback) } Color * -bmp::start_scanline(int scanline) +bmp::start_scanline(int /*scanline*/) { return color_buffer; } @@ -252,9 +255,9 @@ bmp::end_scanline() { if(!file) return false; - + convert_color_format(buffer, color_buffer, desc.get_w(), pf, gamma()); - + if(!fwrite(buffer,1,rowspan,file)) return false;