Permalink
Browse files

Add new CompressionType enum values (IM 6.5.5-4)

  • Loading branch information...
1 parent 53a15d8 commit 080cedcee773d50a848c92fd397cce53b1320f2e rmagick committed Sep 5, 2009
Showing with 49 additions and 5 deletions.
  1. +8 −0 ChangeLog
  2. +7 −1 ext/RMagick/extconf.rb
  3. +17 −2 ext/RMagick/rmenum.c
  4. +17 −2 ext/RMagick/rmmain.c
View
@@ -1,3 +1,11 @@
+RMagick 2.11.1
+ o Applied Alexey Borzenkov's mingw patches to extconf.rb.
+ o Fixed a bug in Magick.trace_proc that could cause a segv at program exit
+ with Ruby 1.9.1 (bug report by Larry Young)
+ o Added new CompressionType enum values ZipSCompression, PixCompression,
+ Pxr24Compression, B44Compression, B44ACompression (available in
+ ImageMagick 6.5.5-4)
+
RMagick 2.11.0
o Fix bug #26475, dissolve and watermark don't work with new versions of
ImageMagick (reported by Jim Crate)
View
@@ -276,7 +276,13 @@ def check_multiple_imagemagick_versions()
"VividLightCompositeOp"], headers) # 6.5.4-3
have_enum_values("CompressionType", ["DXT1Compression", # 6.3.9-3
"DXT3Compression", # 6.3.9-3
- "DXT5Compression"], headers) # 6.3.9-3
+ "DXT5Compression", # 6.3.9-3
+ "ZipSCompression", # 6.5.5-4
+ "PizCompression", # 6.5.5-4
+ "Pxr24Compression", # 6.5.5-4
+ "B44Compression", # 6.5.5-4
+ "B44ACompression"], headers) # 6.5.5-4
+
have_enum_values("DistortImageMethod", ["BarrelDistortion", # 6.4.2-5
"BarrelInverseDistortion", # 6.4.3-8
"BilinearForwardDistortion", # 6.5.1-2
View
@@ -1,4 +1,4 @@
-/* $Id: rmenum.c,v 1.7 2009/07/21 23:12:43 rmagick Exp $ */
+/* $Id: rmenum.c,v 1.8 2009/09/05 20:01:08 rmagick Exp $ */
/*============================================================================\
| Copyright (C) 2009 by Timothy P. Hunter
| Name: rmenum.c
@@ -480,6 +480,12 @@ CompressionType_name(CompressionType ct)
{
ENUM_TO_NAME(UndefinedCompression)
ENUM_TO_NAME(NoCompression)
+#if defined(HAVE_ENUM_B44COMPRESSION)
+ ENUM_TO_NAME(B44Compression)
+#endif
+#if defined(HAVE_ENUM_B44ACOMPRESSION)
+ ENUM_TO_NAME(B44ACompression)
+#endif
ENUM_TO_NAME(BZipCompression)
#if defined(HAVE_ENUM_DXT1COMPRESSION)
ENUM_TO_NAME(DXT1Compression)
@@ -496,9 +502,18 @@ CompressionType_name(CompressionType ct)
ENUM_TO_NAME(JPEG2000Compression)
ENUM_TO_NAME(LosslessJPEGCompression)
ENUM_TO_NAME(LZWCompression)
+#if defined(HAVE_ENUM_PIZCOMPRESSION)
+ ENUM_TO_NAME(PizCompression)
+#endif
+#if defined(HAVE_ENUM_PXR24COMPRESSION)
+ ENUM_TO_NAME(Pxr24Compression)
+#endif
ENUM_TO_NAME(RLECompression)
ENUM_TO_NAME(ZipCompression)
- }
+#if defined(HAVE_ENUM_ZIPSCOMPRESSION)
+ ENUM_TO_NAME(ZipSCompression)
+#endif
+ }
return "UndefinedCompression";
}
View
@@ -1,4 +1,4 @@
-/* $Id: rmmain.c,v 1.298 2009/07/23 22:55:57 rmagick Exp $ */
+/* $Id: rmmain.c,v 1.299 2009/09/05 20:01:08 rmagick Exp $ */
/*============================================================================\
| Copyright (C) 2009 by Timothy P. Hunter
| Name: rmmain.c
@@ -1021,6 +1021,12 @@ Init_RMagick2(void)
DEF_ENUM(CompressionType)
ENUMERATOR(UndefinedCompression)
ENUMERATOR(NoCompression)
+#if defined(HAVE_ENUM_B44COMPRESSION)
+ ENUMERATOR(B44Compression)
+#endif
+#if defined(HAVE_ENUM_B44ACOMPRESSION)
+ ENUMERATOR(B44ACompression)
+#endif
ENUMERATOR(BZipCompression)
#if defined(HAVE_ENUM_DXT1COMPRESSION)
ENUMERATOR(DXT1Compression)
@@ -1037,8 +1043,17 @@ Init_RMagick2(void)
ENUMERATOR(JPEG2000Compression)
ENUMERATOR(LosslessJPEGCompression)
ENUMERATOR(LZWCompression)
+#if defined(HAVE_ENUM_PIZCOMPRESSION)
+ ENUMERATOR(PizCompression)
+#endif
+#if defined(HAVE_ENUM_PXR24COMPRESSION)
+ ENUMERATOR(Pxr24Compression)
+#endif
ENUMERATOR(RLECompression)
ENUMERATOR(ZipCompression)
+#if defined(HAVE_ENUM_ZIPSCOMPRESSION)
+ ENUMERATOR(ZipSCompression)
+#endif
END_ENUM
// DecorationType constants
@@ -1623,7 +1638,7 @@ version_constants(void)
rb_define_const(Module_Magick, "Version", str);
sprintf(long_version,
- "This is %s ($Date: 2009/07/23 22:55:57 $) Copyright (C) 2009 by Timothy P. Hunter\n"
+ "This is %s ($Date: 2009/09/05 20:01:08 $) Copyright (C) 2009 by Timothy P. Hunter\n"
"Built with %s\n"
"Built for %s\n"
"Web page: http://rmagick.rubyforge.org\n"

0 comments on commit 080cedc

Please sign in to comment.