diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-04-14 14:38:11 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-04-14 14:38:11 +0400 |
| commit | 4a19ccfa5fb5cae359269ecaac389f6aace9f959 (patch) | |
| tree | 78aa22e116cf7aed6d10d851978a5bdcf807fa84 /source/blender/imbuf | |
| parent | 5f02b167d191969474c8f3575abdd6dbaeffeb57 (diff) | |
| parent | 9a79bd38ade00fc663c27ffda9892629ef5ca755 (diff) | |
Merged changes in the trunk up to revision 45619.
Diffstat (limited to 'source/blender/imbuf')
| -rw-r--r-- | source/blender/imbuf/intern/IMB_anim.h | 5 | ||||
| -rw-r--r-- | source/blender/imbuf/intern/imageprocess.c | 2 |
2 files changed, 2 insertions, 5 deletions
diff --git a/source/blender/imbuf/intern/IMB_anim.h b/source/blender/imbuf/intern/IMB_anim.h index b29d9d419e2..8724f3804d0 100644 --- a/source/blender/imbuf/intern/IMB_anim.h +++ b/source/blender/imbuf/intern/IMB_anim.h @@ -50,10 +50,7 @@ # undef AVIIF_KEYFRAME // redefined in AVI_avi.h # undef AVIIF_LIST // redefined in AVI_avi.h - -# define FIXCC(fcc) if (fcc == 0) fcc = mmioFOURCC('N', 'o', 'n', 'e'); \ - if (fcc == BI_RLE8) fcc = mmioFOURCC('R', 'l', 'e', '8'); -#endif +#endif /* _WIN32 */ #include <sys/types.h> #include <ctype.h> diff --git a/source/blender/imbuf/intern/imageprocess.c b/source/blender/imbuf/intern/imageprocess.c index 1976242ea4f..ba165d51e96 100644 --- a/source/blender/imbuf/intern/imageprocess.c +++ b/source/blender/imbuf/intern/imageprocess.c @@ -46,7 +46,7 @@ #include "IMB_imbuf_types.h" #include "IMB_imbuf.h" -#include "math.h" +#include <math.h> /* This define should be relocated to a global header some where Kent Mein * I stole it from util.h in the plugins api */ |