Permalink
Browse files

Handle absence of AllChannels enum

  • Loading branch information...
1 parent 6168806 commit 6785b86152767be880e1991592db9cf591ea13a5 rmagick committed Jun 28, 2006
Showing with 12 additions and 4 deletions.
  1. +12 −4 ext/RMagick/rmimage.c
View
@@ -1,4 +1,4 @@
-/* $Id: rmimage.c,v 1.152 2006/06/26 23:32:36 rmagick Exp $ */
+/* $Id: rmimage.c,v 1.153 2006/06/28 23:07:16 rmagick Exp $ */
/*============================================================================\
| Copyright (C) 2006 by Timothy P. Hunter
| Name: rmimage.c
@@ -2190,7 +2190,11 @@ VALUE Image_composite_bang(
VALUE *argv,
VALUE self)
{
- ChannelType channels = (AllChannels &~ OpacityChannel);
+#if defined(HAVE_ALLCHANNELS)
+ ChannelType channels = (AllChannels &~ OpacityChannel);
+#else
+ ChannelType channels = (0xff &~ OpacityChannel);
+#endif
return composite(True, argc, argv, self, channels);
}
@@ -2199,7 +2203,11 @@ VALUE Image_composite(
VALUE *argv,
VALUE self)
{
- ChannelType channels = (AllChannels &~ OpacityChannel);
+#if defined(HAVE_ALLCHANNELS)
+ ChannelType channels = (AllChannels &~ OpacityChannel);
+#else
+ ChannelType channels = (0xff &~ OpacityChannel);
+#endif
return composite(False, argc, argv, self, channels);
}
@@ -2929,7 +2937,7 @@ Image_dispatch(int argc, VALUE *argv, VALUE self)
StorageType stg_type = FIX_STG_TYPE;
char *map;
long mapL;
- boolean okay;
+ MagickBooleanType okay;
ExceptionInfo exception;
union
{

0 comments on commit 6785b86

Please sign in to comment.