rmagick 1.7.1 → 1.7.2

data/README.txt

@@ -1,11 +1,11 @@
 
-  RMagick 1.7.1
+  RMagick 1.7.2
 
 
     README
 
 
-        12/25/04
+        02/23/05
 
 
     Table of Contents
@@ -204,7 +204,7 @@ addition to the regular options, there are a few RMagick-specific options:
 
         Running the |configure| and |make| scripts
 
-De-compress the RMagick-1.7.1.tar.gz archive and enter the
+De-compress the RMagick-1.7.2.tar.gz archive and enter the
 top directory. Then type:
 
     $ ./configure <configuration options>
@@ -221,9 +221,9 @@ top directory. Then type:
 
     When |make| is running the examples, if you get a message like this:
 
-/home/you/RMagick-1.7.1/lib/RMagick.rb:11:in `require': libMagick.so.0:
+/home/you/RMagick-1.7.2/lib/RMagick.rb:11:in 'require': libMagick.so.0:
   cannot open shared object file: No such file or directory -
-  /home/you/RMagick-1.7.1/ext/RMagick/RMagick.so (LoadError)
+  /home/you/RMagick-1.7.2/ext/RMagick/RMagick.so (LoadError)
 
     you probably do not have the directory in which the ImageMagick or
     GraphicsMagick library is installed in your load path. An easy way
@@ -243,7 +243,7 @@ export LD_LIBRARY_PATH=/usr/local/lib
 
     When |make| is running the examples, if you get a message like this:
 
-hook /home/me/src/RMagick-1.7.1/./post-setup.rb failed:
+hook /home/me/src/RMagick-1.7.2/./post-setup.rb failed:
 No such file or directory - "/tmp/rmagick6872.6"
 
     you probably do not have a temporary directory environment variable
@@ -264,7 +264,7 @@ earlier release.
 
     Uninstalling
 
-The `uninstall' target will uninstall RMagick completely:
+The 'uninstall' target will uninstall RMagick completely:
 
     |make uninstall|
 
@@ -390,7 +390,7 @@ CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
 TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-<http://www.opensource.org/docs/definition.php> 	
+<http://www.opensource.org/docs/definition.php>
 
 *This software is OSI Certified Open Source Software.
 OSI Certified is a certification mark of the Open Source Initiative.*

data/configure

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for RMagick 1.7.1.
+# Generated by GNU Autoconf 2.59 for RMagick x.y.z.
 #
 # Report bugs to <rmagick@rubyforge.org>.
 #
@@ -268,9 +268,9 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 
 # Identity of this package.
 PACKAGE_NAME='RMagick'
-PACKAGE_TARNAME='RMagick-1.7.1.tar.gz'
-PACKAGE_VERSION='1.7.1'
-PACKAGE_STRING='RMagick 1.7.1'
+PACKAGE_TARNAME='RMagick-x.y.z.tar.gz'
+PACKAGE_VERSION='x.y.z'
+PACKAGE_STRING='RMagick x.y.z'
 PACKAGE_BUGREPORT='rmagick@rubyforge.org'
 
 # Factoring default headers for most tests.
@@ -779,7 +779,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures RMagick 1.7.1 to adapt to many kinds of systems.
+\`configure' configures RMagick x.y.z to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -836,7 +836,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of RMagick 1.7.1:";;
+     short | recursive ) echo "Configuration of RMagick x.y.z:";;
    esac
   cat <<\_ACEOF
 
@@ -981,7 +981,7 @@ fi
 test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
   cat <<\_ACEOF
-RMagick configure 1.7.1
+RMagick configure x.y.z
 generated by GNU Autoconf 2.59
 
 Copyright (C) 2003 Free Software Foundation, Inc.
@@ -995,7 +995,7 @@ cat >&5 <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by RMagick $as_me 1.7.1, which was
+It was created by RMagick $as_me x.y.z, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   $ $0 $@
@@ -6259,6 +6259,128 @@ _ACEOF
 fi
 
 
+
+echo "$as_me:$LINENO: checking for Image.orientation" >&5
+echo $ECHO_N "checking for Image.orientation... $ECHO_C" >&6
+if test "${ac_cv_member_Image_orientation+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <stdio.h>
+                 #if HAVE_SYS_TYPES_H
+                 #include <sys/types.h>
+                 #endif
+                 #include "magick/api.h"
+
+int
+main ()
+{
+static Image ac_aggr;
+if (ac_aggr.orientation)
+return 0;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_member_Image_orientation=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <stdio.h>
+                 #if HAVE_SYS_TYPES_H
+                 #include <sys/types.h>
+                 #endif
+                 #include "magick/api.h"
+
+int
+main ()
+{
+static Image ac_aggr;
+if (sizeof ac_aggr.orientation)
+return 0;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_member_Image_orientation=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_member_Image_orientation=no
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: $ac_cv_member_Image_orientation" >&5
+echo "${ECHO_T}$ac_cv_member_Image_orientation" >&6
+if test $ac_cv_member_Image_orientation = yes; then
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_IMAGE_ORIENTATION 1
+_ACEOF
+
+
+fi
+
+
 # Don't use AC_CHECK_MEMBERS!
 echo "$as_me:$LINENO: checking for Image.extract_info" >&5
 echo $ECHO_N "checking for Image.extract_info... $ECHO_C" >&6
@@ -7792,7 +7914,7 @@ _ASBOX
 } >&5
 cat >&5 <<_CSEOF
 
-This file was extended by RMagick $as_me 1.7.1, which was
+This file was extended by RMagick $as_me x.y.z, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -7852,7 +7974,7 @@ _ACEOF
 
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-RMagick config.status 1.7.1
+RMagick config.status x.y.z
 configured by $0, generated by GNU Autoconf 2.59,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 

data/configure.ac

@@ -1,7 +1,7 @@
 
 # RMagick configure.ac
 
-AC_INIT(RMagick, 1.7.1, rmagick@rubyforge.org, RMagick-1.7.1.tar.gz)
+AC_INIT(RMagick, x.y.z, rmagick@rubyforge.org, RMagick-x.y.z.tar.gz)
 echo "Configuring ${PACKAGE_STRING}"
 
 AC_CONFIG_HEADER([ext/RMagick/rmagick_config.h])
@@ -158,6 +158,14 @@ AC_CHECK_MEMBERS([ExceptionInfo.module],,,
                  #endif
                  #include "magick/api.h"])
 
+
+AC_CHECK_MEMBERS([Image.orientation],,,
+                [#include <stdio.h>
+                 #if HAVE_SYS_TYPES_H
+                 #include <sys/types.h>
+                 #endif
+                 #include "magick/api.h"])
+
 # Don't use AC_CHECK_MEMBERS!
 AC_CACHE_CHECK(for Image.extract_info, rm_cv_member_Image_extract_info,
   AC_TRY_COMPILE([

data/doc/draw.html

@@ -2619,8 +2619,8 @@ gc.text(10,10, %q/{"What's up?"}/) » "What's up?"
 
     <h4>Arguments</h4>
 
-    <p>One of the constants <code>AnchorStart</code>,
-    <code>AnchorMiddle</code>, or <code>AnchorEnd</code>.</p>
+    <p>One of the constants <code>StartAnchor</code>,
+    <code>MiddleAnchor</code>, or <code>EndAnchor</code>.</p>
 
     <h4>Returns</h4>
 

data/ext/RMagick/MANIFEST

@@ -1,4 +1,4 @@
-MANIFEST for RMagick-1.7.1 - 13:58:08 12/25/04
+MANIFEST for RMagick-1.7.2 - 10:33:42 02/23/05
 
 configure
 lib/RMagick.rb
@@ -11,6 +11,7 @@ examples/image_opacity.rb
 examples/histogram.rb
 examples/describe.rb
 uninstall.rb
+rmagick.gemspec
 post-setup.rb
 post-install.rb
 post-clean.rb

data/ext/RMagick/rmagick.h

@@ -1,4 +1,4 @@
-/* $Id: rmagick.h,v 1.75 2004/12/15 23:58:33 rmagick Exp $ */
+/* $Id: rmagick.h,v 1.75.2.1 2005/01/11 23:00:56 rmagick Exp $ */
 /*=============================================================================
 |               Copyright (C) 2004 by Timothy P. Hunter
 | Name:     rmagick.h
@@ -259,6 +259,9 @@ EXTERN VALUE Class_ResolutionType;
 EXTERN VALUE Class_StretchType;
 EXTERN VALUE Class_StyleType;
 EXTERN VALUE Class_WeightType;
+#if defined(HAVE_IMAGE_ORIENTATION)
+EXTERN VALUE Class_OrientationType;
+#endif
 
 /*
 *   Commonly-used IDs
@@ -632,7 +635,9 @@ ATTR_READER(Image, normalized_maximum_error)
 ATTR_READER(Image, number_colors)
 ATTR_ACCESSOR(Image, offset)
 ATTR_WRITER(Image, opacity)
+ATTR_READER(Image, orientation)
 ATTR_ACCESSOR(Image, page)
+ATTR_READER(Image, quality)
 ATTR_READER(Image, quantum_depth)
 ATTR_ACCESSOR(Image, rendering_intent)
 ATTR_READER(Image, rows)
@@ -895,6 +900,9 @@ extern VALUE  TypeMetric_from_TypeMetric(TypeMetric *);
 #if defined(HAVE_GETIMAGESTATISTICS)
 extern VALUE  Statistics_new(ImageStatistics *);
 #endif
+#if defined(HAVE_IMAGE_ORIENTATION)
+extern VALUE   OrientationType_new(OrientationType);
+#endif
 
 #if defined(HAVE_RB_DEFINE_ALLOC_FUNC)
 extern VALUE  Enum_alloc(VALUE);

data/ext/RMagick/rmagick_config.h.in

@@ -100,6 +100,8 @@
 #undef HAVE_INDEXCHANNEL
 /* Introduced in IM 5.5.6 */
 #undef HAVE_IMAGE_EXTRACT_INFO
+/* Introduced in IM 6.0.0 */
+#undef HAVE_IMAGE_ORIENTATION
 /* Introduced in IM 5.5.6 */
 #undef HAVE_IMAGEINFO_NUMBER_SCENES
 /* Introduced in IM 5.5.7, GM 1.1 */

data/ext/RMagick/rmimage.c

@@ -1,4 +1,4 @@
-/* $Id: rmimage.c,v 1.89 2004/12/24 21:29:48 rmagick Exp $ */
+/* $Id: rmimage.c,v 1.89.2.1 2005/01/11 23:00:56 rmagick Exp $ */
 /*============================================================================\
 |                Copyright (C) 2004 by Timothy P. Hunter
 | Name:     rmimage.c
@@ -5065,6 +5065,24 @@ Image_ordered_dither(VALUE self)
     return rm_image_new(new_image);
 }
 
+/*
+    Method:     Image#orientation
+    Purpose:    Return the orientation attribute as an OrientationType enum value.
+*/
+VALUE
+Image_orientation(VALUE self)
+{
+#if defined(HAVE_IMAGE_ORIENTATION)
+    Image *image;
+
+    Data_Get_Struct(self, Image, image);
+    return OrientationType_new(image->orientation);
+#else
+    rm_not_implemented();
+    return (VALUE)0;
+#endif
+}
+
 /*
     Method:     Image#page
     Purpose:    the page attribute getter
@@ -5607,6 +5625,9 @@ Image_radial_blur(VALUE self, VALUE angle)
 }
 
 
+DEF_ATTR_READER(Image, quality, ulong)
+
+
 /*
     Method:     Image#quantize(<number_colors<, colorspace<, dither<, tree_depth<, measure_error>>>>>)
                 defaults: 256, Magick::RGBColorspace, true, 0, false

data/ext/RMagick/rmmain.c

@@ -1,4 +1,4 @@
-/* $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
@@ -600,7 +600,9 @@ Init_RMagick(void)
     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)
@@ -1293,6 +1295,21 @@ Init_RMagick(void)
         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)
@@ -1406,17 +1423,17 @@ Init_RMagick(void)
     // 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
 
@@ -1432,40 +1449,40 @@ Init_RMagick(void)
                                             , "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);
 
@@ -1486,7 +1503,7 @@ static void version_constants(void)
 
     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"