X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=sidebyside;f=synfig-core%2Ftrunk%2Fsrc%2Fmodules%2Fmod_ppm%2Fmptr_ppm.cpp;h=590940e12dd53fbb4216ee15631589ef89d8602f;hb=6e6b8ce1d75be6a6b99d2cc955faeeea80d62c26;hp=0831645df0993899a86cff8221f036d9ef92565c;hpb=21bfc670b83d4c45da9ed1b95063b7e6a007168c;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 0831645..590940e 100644 --- a/synfig-core/trunk/src/modules/mod_ppm/mptr_ppm.cpp +++ b/synfig-core/trunk/src/modules/mod_ppm/mptr_ppm.cpp @@ -50,7 +50,7 @@ using namespace etl; /* === G L O B A L S ======================================================= */ SYNFIG_IMPORTER_INIT(ppm_mptr); -SYNFIG_IMPORTER_SET_NAME(ppm_mptr,"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 $"); @@ -72,23 +72,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);