ext/RMagick/rmmain.c in rmagick-1.7.1 vs ext/RMagick/rmmain.c in rmagick-1.7.2

- old
+ new

@@ -1,6 +1,6 @@ -/* $Id: rmmain.c,v 1.74 2004/12/10 00:00:12 rmagick Exp $ */ +/* $Id: rmmain.c,v 1.74.2.2 2005/02/23 15:09:50 rmagick Exp $ */ /*============================================================================\ | Copyright (C) 2004 by Timothy P. Hunter | Name: rmmain.c | Author: Tim Hunter | Purpose: Contains all module, class, method declarations. @@ -598,11 +598,13 @@ DCL_ATTR_READER(Image, normalized_mean_error) DCL_ATTR_READER(Image, normalized_maximum_error) DCL_ATTR_READER(Image, number_colors) DCL_ATTR_ACCESSOR(Image, offset) DCL_ATTR_WRITER(Image, opacity) + DCL_ATTR_READER(Image, orientation) DCL_ATTR_ACCESSOR(Image, page) + DCL_ATTR_READER(Image, quality) DCL_ATTR_READER(Image, quantum_depth) DCL_ATTR_ACCESSOR(Image, rendering_intent) DCL_ATTR_READER(Image, rows) DCL_ATTR_READER(Image, scene) DCL_ATTR_ACCESSOR(Image, start_loop) @@ -1291,10 +1293,25 @@ ENUMERATOR(ImpulseNoise) ENUMERATOR(LaplacianNoise) ENUMERATOR(PoissonNoise) END_ENUM +#if defined(HAVE_IMAGE_ORIENTATION) + // Orientation constants + DEF_ENUM(OrientationType) + ENUMERATOR(UndefinedOrientation) + ENUMERATOR(TopLeftOrientation) + ENUMERATOR(TopRightOrientation) + ENUMERATOR(BottomRightOrientation) + ENUMERATOR(BottomLeftOrientation) + ENUMERATOR(LeftTopOrientation) + ENUMERATOR(RightTopOrientation) + ENUMERATOR(RightBottomOrientation) + ENUMERATOR(LeftBottomOrientation) + END_ENUM +#endif + // Paint method constants DEF_ENUM(PaintMethod) ENUMERATOR(PointMethod) ENUMERATOR(ReplaceMethod) ENUMERATOR(FloodfillMethod) @@ -1404,21 +1421,21 @@ // Pass NULL as the structure name to keep them from polluting the Struct // namespace. The only way to use these classes is via the Magick:: namespace. // Magick::AffineMatrix - Class_AffineMatrix = rb_struct_define(NULL, "sx", "rx", "ry", "sy", "tx", "ty", 0); + Class_AffineMatrix = rb_struct_define(NULL, "sx", "rx", "ry", "sy", "tx", "ty", NULL); rb_define_const(Module_Magick, "AffineMatrix", Class_AffineMatrix); #if defined(HAVE_GETIMAGESTATISTICS) // These classes are defined for >= GM 1.1. // Magick::Statistics - Class_Statistics = rb_struct_define(NULL, "red", "green", "blue", "opacity", 0); + Class_Statistics = rb_struct_define(NULL, "red", "green", "blue", "opacity", NULL); rb_define_const(Module_Magick, "Statistics", Class_Statistics); // Magick::ChannelStatistics - Class_StatisticsChannel = rb_struct_define(NULL, "max", "min", "mean", "stddev", "var", 0); + Class_StatisticsChannel = rb_struct_define(NULL, "max", "min", "mean", "stddev", "var", NULL); rb_define_const(Class_Statistics, "Channel", Class_StatisticsChannel); #endif // Magick::Primary @@ -1430,44 +1447,44 @@ Class_Chromaticity = rb_struct_define(NULL , "red_primary" , "green_primary" , "blue_primary" , "white_point" - , 0); + , NULL); rb_define_method(Class_Chromaticity, "to_s", ChromaticityInfo_to_s, 0); rb_define_const(Module_Magick, "Chromaticity", Class_Chromaticity); // Magick::Color - Class_Color = rb_struct_define(NULL, "name", "compliance", "color", 0); + Class_Color = rb_struct_define(NULL, "name", "compliance", "color", NULL); rb_define_method(Class_Color, "to_s", Color_to_s, 0); rb_define_const(Module_Magick, "Color", Class_Color); // Magick::Point - Class_Point = rb_struct_define(NULL, "x", "y", 0); + Class_Point = rb_struct_define(NULL, "x", "y", NULL); rb_define_const(Module_Magick, "Point", Class_Point); // Magick::Rectangle - Class_Rectangle = rb_struct_define(NULL, "width", "height", "x", "y", 0); + Class_Rectangle = rb_struct_define(NULL, "width", "height", "x", "y", NULL); rb_define_method(Class_Rectangle, "to_s", RectangleInfo_to_s, 0); rb_define_const(Module_Magick, "Rectangle", Class_Rectangle); // Magick::Segment - Class_Segment = rb_struct_define(NULL, "x1", "y1", "x2", "y2", 0); + Class_Segment = rb_struct_define(NULL, "x1", "y1", "x2", "y2", NULL); rb_define_method(Class_Segment, "to_s", SegmentInfo_to_s, 0); rb_define_const(Module_Magick, "Segment", Class_Segment); // Magick::Font Class_Font = rb_struct_define(NULL, "name", "description", "family", "style", "stretch", "weight", - "encoding", "foundry", "format", 0); + "encoding", "foundry", "format", NULL); rb_define_method(Class_Font, "to_s", Font_to_s, 0); rb_define_const(Module_Magick, "Font", Class_Font); // Magick::TypeMetric Class_TypeMetric = rb_struct_define(NULL, "pixels_per_em", "ascent", "descent", "width", "height", "max_advance", "bounds", - "underline_position", "underline_thickness", 0); + "underline_position", "underline_thickness", NULL); rb_define_method(Class_TypeMetric, "to_s", TypeMetric_to_s, 0); rb_define_const(Module_Magick, "TypeMetric", Class_TypeMetric); } @@ -1484,10 +1501,10 @@ mgk_version = GetMagickVersion(NULL); rb_define_const(Module_Magick, "Magick_version", rb_str_new2(mgk_version)); rb_define_const(Module_Magick, "Version", rb_str_new2(PACKAGE_STRING)); sprintf(long_version, - "This is %s ($Date: 2004/12/10 00:00:12 $) Copyright (C) 2004 by Timothy P. Hunter\n" + "This is %s ($Date: 2005/02/23 15:09:50 $) Copyright (C) 2004 by Timothy P. Hunter\n" "Built with %s\n" "Built for %s\n" "Web page: http://rmagick.rubyforge.org\n" "Email: rmagick@rubyforge.org\n", PACKAGE_STRING, mgk_version, RUBY_VERSION_STRING);