X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fmodules%2Fmod_ppm%2Fmptr_ppm.cpp;h=6900c937e0e730f5c04c32898f53fee83bce636e;hb=9459638ad6797b8139f1e9f0715c96076dbf0890;hp=5b6bf253e6e204a4b8877f8073ac0a9ca574062e;hpb=f0bb3efdc247acff17a7feb7c3d22911f47959f7;p=synfig.git diff --git a/synfig-core/trunk/src/modules/mod_ppm/mptr_ppm.cpp b/synfig-core/trunk/src/modules/mod_ppm/mptr_ppm.cpp index 5b6bf25..6900c93 100644 --- a/synfig-core/trunk/src/modules/mod_ppm/mptr_ppm.cpp +++ b/synfig-core/trunk/src/modules/mod_ppm/mptr_ppm.cpp @@ -1,8 +1,10 @@ -/*! ======================================================================== -** Synfig -** ppm Target Module -** $Id: mptr_ppm.cpp,v 1.1.1.1 2005/01/04 01:23:14 darco Exp $ +/* === S Y N F I G ========================================================= */ +/*! \file mptr_ppm.cpp +** \brief ppm Target Module ** +** $Id$ +** +** \legal ** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley ** ** This package is free software; you can redistribute it and/or @@ -14,6 +16,7 @@ ** 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 =========================================================== ** @@ -53,7 +56,7 @@ SYNFIG_IMPORTER_INIT(ppm_mptr); SYNFIG_IMPORTER_SET_NAME(ppm_mptr,"ppm"); SYNFIG_IMPORTER_SET_EXT(ppm_mptr,"ppm"); SYNFIG_IMPORTER_SET_VERSION(ppm_mptr,"0.1"); -SYNFIG_IMPORTER_SET_CVS_ID(ppm_mptr,"$Id: mptr_ppm.cpp,v 1.1.1.1 2005/01/04 01:23:14 darco Exp $"); +SYNFIG_IMPORTER_SET_CVS_ID(ppm_mptr,"$Id$"); /* === M E T H O D S ======================================================= */ @@ -72,23 +75,23 @@ ppm_mptr::get_frame(synfig::Surface &surface,Time, synfig::ProgressCallback *cb) SmartFILE file(fopen(filename.c_str(),"rb")); if(!file) { - if(cb)cb->error("pp_mptr::GetFrame(): "+strprintf(_("Unable to open %s"),filename.c_str())); + if(cb)cb->error("pp_mptr::GetFrame(): "+strprintf(_("Unable to open %s"),filename.c_str())); return false; } int w,h; float divisor; - + if(fgetc(file.get())!='P' || fgetc(file.get())!='6') { - if(cb)cb->error("pp_mptr::GetFrame(): "+strprintf(_("%s was not in PPM format"),filename.c_str())); + if(cb)cb->error("pp_mptr::GetFrame(): "+strprintf(_("%s was not in PPM format"),filename.c_str())); return false; } - + fgetc(file.get()); fscanf(file.get(),"%d %d\n",&w,&h); fscanf(file.get(),"%f",&divisor); fgetc(file.get()); - + int x; int y; surface.set_wh(w,h);