projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add a macro to check the type of value before using it. This will be used by each...
[synfig.git]
/
synfig-core
/
trunk
/
src
/
modules
/
mod_ppm
/
mptr_ppm.cpp
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
..
6900c93
100644
(file)
--- 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
** 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.
** 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 ===========================================================
**
**
** === N O T E S ===========================================================
**
@@
-50,10
+53,10
@@
using namespace etl;
/* === G L O B A L S ======================================================= */
SYNFIG_IMPORTER_INIT(ppm_mptr);
/* === 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_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 ======================================================= */
/* === 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)
{
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;
return false;
}
int w,h;
float divisor;
-
+
if(fgetc(file.get())!='P' || fgetc(file.get())!='6')
{
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;
}
return false;
}
-
+
fgetc(file.get());
fscanf(file.get(),"%d %d\n",&w,&h);
fscanf(file.get(),"%f",&divisor);
fgetc(file.get());
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);
int x;
int y;
surface.set_wh(w,h);