projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'genete_static_values'
[synfig.git]
/
synfig-core
/
src
/
modules
/
mod_bmp
/
mptr_bmp.cpp
diff --git
a/synfig-core/src/modules/mod_bmp/mptr_bmp.cpp
b/synfig-core/src/modules/mod_bmp/mptr_bmp.cpp
index
9151cfe
..
26b950c
100644
(file)
--- a/
synfig-core/src/modules/mod_bmp/mptr_bmp.cpp
+++ b/
synfig-core/src/modules/mod_bmp/mptr_bmp.cpp
@@
-24,8
+24,6
@@
/* === H E A D E R S ======================================================= */
/* === H E A D E R S ======================================================= */
-#define SYNFIG_NO_ANGLE
-
#ifdef USING_PCH
# include "pch.h"
#else
#ifdef USING_PCH
# include "pch.h"
#else
@@
-125,7
+123,7
@@
bmp_mptr::~bmp_mptr()
}
bool
}
bool
-bmp_mptr::get_frame(synfig::Surface &surface,Time /*time*/, synfig::ProgressCallback *cb)
+bmp_mptr::get_frame(synfig::Surface &surface,
const synfig::RendDesc &renddesc,
Time /*time*/, synfig::ProgressCallback *cb)
{
FILE *file=fopen(filename.c_str(),"rb");
if(!file)
{
FILE *file=fopen(filename.c_str(),"rb");
if(!file)