summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPixel <pixel@nobis-crew.org>2009-06-01 09:30:01 -0700
committerPixel <pixel@nobis-crew.org>2009-06-01 09:30:01 -0700
commite1fbd9d5d5bd29935381c8a296dd95a4959fd4dc (patch)
tree861e3b3bbd55197e04b5fb17aa7edf776d9f16c2
parent3a8687ec3ac192071899d865716e461d779e8090 (diff)
parent1604f7d793aa9678dbab3e115dce07b19446b52e (diff)
Merge branch 'master' of ssh+git://pixel@git.grumpycoder.net/pub/repo.git/lua-modules
-rw-r--r--src/plugin-luaosmesa.cc9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/plugin-luaosmesa.cc b/src/plugin-luaosmesa.cc
index e344fca..b5e24e2 100644
--- a/src/plugin-luaosmesa.cc
+++ b/src/plugin-luaosmesa.cc
@@ -20,6 +20,13 @@
#define WEAK
#endif
+#if MagickLibVersion >= 0x650
+#define MAGICKCUBIC MagickCore::CubicFilter
+#else
+#define MAGICKCUBIC MagickLib::CubicFilter
+#endif
+
+
OSMesaContext ctx = 0;
void *buffer = 0;
int width = -1;
@@ -102,7 +109,7 @@ void flip_scene(scene_t * scene, const char * buffer, int width, int height, boo
if (upscale) {
// i.resize(Magick::Geometry(width / 2, height / 2));
- i.filterType(MagickLib::CubicFilter);
+ i.filterType(MAGICKCUBIC);
i.scale(Magick::Geometry(width / 2, height / 2));
}