ruby-vips 0.2.1 → 0.3.0

data/ext/image_mosaicing.h

@@ -12,3 +12,4 @@ VALUE img_correl(VALUE, VALUE, VALUE, VALUE, VALUE,	VALUE, VALUE, VALUE);
 VALUE img_remosaic(VALUE, VALUE, VALUE);
 VALUE img_align_bands(VALUE);
 VALUE img_maxpos_subpel(VALUE);
+void init_Image_mosaicing(void);

data/ext/image_relational.c

@@ -1,6 +1,4 @@
 #include "ruby_vips.h"
-#include "image.h"
-#include "image_relational.h"
 
 static VALUE
 img_equal_const(int argc, VALUE *argv, VALUE obj)

data/ext/image_resample.c

@@ -1,8 +1,4 @@
 #include "ruby_vips.h"
-#include "image.h"
-#include "interpolator.h"
-#include "header.h"
-#include "image_resample.h"
 
 /*
  *  call-seq:

data/ext/interpolator.c

@@ -89,7 +89,7 @@ interp_description(VALUE obj)
  */
 
 void
-init_Interpolator()
+init_Interpolator(void)
 {
     cVIPSInterpolator = rb_define_class_under(mVIPS, "Interpolator", rb_cObject);
 

data/ext/interpolator.h

@@ -2,5 +2,6 @@
 #define RUBY_VIPS_INTERPOLATOR_H
 
 VipsInterpolate* interp_lookup(VALUE);
+void init_Interpolator(void);
 
 #endif

data/ext/mask.c

@@ -1,6 +1,4 @@
 #include "ruby_vips.h"
-#include "mask.h"
-#include "image.h"
 
 VALUE cVIPSMask;
 
@@ -328,7 +326,7 @@ mask_to_image(VALUE obj)
  */
 
 void
-init_Mask()
+init_Mask( void )
 {
     cVIPSMask = rb_define_class_under(mVIPS, "Mask", rb_cObject);
 

data/ext/mask.h

@@ -13,5 +13,6 @@ VALUE mask_alloc(VALUE);
 VALUE imask2rb(INTMASK*);
 VALUE dmask2rb(DOUBLEMASK*);
 void mask_arg2mask(VALUE, INTMASK**, DOUBLEMASK**);
+void init_Mask( void );
 
 #endif

data/ext/reader.c

@@ -1,6 +1,4 @@
 #include "ruby_vips.h"
-#include "image.h"
-#include "header.h"
 
 ID id_iv__vips_fmt;
 
@@ -17,7 +15,7 @@ reader_get_fmt_class(VALUE klass)
 
     nickname = StringValuePtr(nickname_v);
 
-	if (!(fmt_class = (VipsFormatClass*)vips_class_find("VipsFormat", nickname)))
+    if (!(fmt_class = (VipsFormatClass*)vips_class_find("VipsFormat", nickname)))
 		return NULL;
 
     return fmt_class;
@@ -25,31 +23,6 @@ reader_get_fmt_class(VALUE klass)
 
 /* :nodoc: */
 
-static VALUE
-reader_read_header(VALUE obj, VALUE path)
-{
-    VipsImage *im_new;
-    VipsFormatClass *fmt_class = reader_get_fmt_class(CLASS_OF(obj));
-    GetImg(obj, data, im);
-
-	if (!fmt_class)
-		return Qfalse;
-
-    if (!(im_new = (VipsImage*)im_open("reader_read_header", "p")))
-        vips_lib_error();
-
-    if (fmt_class->header(StringValuePtr(path), im_new)) {
-        im_close(im_new);
-        vips_lib_error();
-    }
-
-    data->in = im_new;
-
-    return Qtrue;
-}
-
-/* :nodoc: */
-
 static VALUE
 reader_s_recognized_p(VALUE klass, VALUE path)
 {
@@ -64,118 +37,18 @@ reader_s_recognized_p(VALUE klass, VALUE path)
 /* :nodoc: */
 
 static VALUE
-reader_read_internal(VALUE obj, VALUE path)
-{
-    VipsImage *im;
-
-    if (!(im = im_open(StringValuePtr(path), "r")))
-        vips_lib_error();
-
-    return img_init(cVIPSImage, im);
-}
-
-/* :nodoc: */
-
-static VALUE
-jpeg_read_internal(VALUE obj, VALUE path)
-{
-    OutPartial(new, data, im);
-
-    if (im_jpeg2vips(StringValuePtr(path), im))
-        vips_lib_error();
-
-    return new;
-}
-
-/* :nodoc: */
-
-static VALUE
-tiff_read_internal(VALUE obj, VALUE path)
-{
-    OutPartial(new, data, im);
-
-    if (im_tiff2vips(StringValuePtr(path), im))
-        vips_lib_error();
-
-    return new;
-}
-
-/* :nodoc: */
-
-static VALUE
-magick_read_internal(VALUE obj, VALUE path)
-{
-	OutPartial(new, data, im);
-
-    if (im_magick2vips(StringValuePtr(path), im))
-        vips_lib_error();
-
-    return new;
-}
-
-/* :nodoc: */
-
-static VALUE
-exr_read_internal(VALUE obj, VALUE path)
-{
-	OutPartial(new, data, im);
-
-    if (im_exr2vips(StringValuePtr(path), im))
-        vips_lib_error();
-
-    return new;
-}
-
-/* :nodoc: */
-
-static VALUE
-ppm_read_internal(VALUE obj, VALUE path)
-{
-	OutPartial(new, data, im);
-
-    if (im_ppm2vips(StringValuePtr(path), im))
-        vips_lib_error();
-
-    return new;
-}
-
-/* :nodoc: */
-
-static VALUE
-analyze_read_internal(VALUE obj, VALUE path)
-{
-	OutPartial(new, data, im);
-
-    if (im_analyze2vips(StringValuePtr(path), im))
-        vips_lib_error();
-
-    return new;
-}
-
-/* :nodoc: */
-
-static VALUE
-csv_read_internal(VALUE obj, VALUE path)
+reader_read_internal(VALUE obj, VALUE path, VALUE flags)
 {
-	OutPartial(new, data, im);
-
-    if (im_csv2vips(StringValuePtr(path), im))
-        vips_lib_error();
+	VipsImage *im_new;
 
-    return new;
-}
-
-/* :nodoc: */
+	/* flags bit 1 means "sequential mode requested".
+	 */
+	char *mode = NUM2INT(flags) & 1 ? "rs" : "rd";
 
-static VALUE
-png_read_internal(VALUE obj, VALUE path)
-{
-	OutPartial(new, data, im);
-
-    if (im_png2vips(StringValuePtr(path), im))
+    if (!(im_new = im_open(StringValuePtr(path), mode)))
         vips_lib_error();
 
-    return new;
+	return img_init(cVIPSImage, im_new);
 }
 
 /* :nodoc: */
@@ -184,26 +57,17 @@ static VALUE
 raw_read_internal(VALUE obj, VALUE path, VALUE width, VALUE height, VALUE bpp,
     VALUE offset)
 {
-	OutPartial(new, data, im);
+	VipsImage *im_new;
 
-    if (im_raw2vips(StringValuePtr(path), im, NUM2INT(width), NUM2INT(height),
-		NUM2INT(bpp), NUM2INT(offset)))
+    if (!(im_new = im_open(StringValuePtr(path), "p")))
         vips_lib_error();
-
-    return new;
-}
-
-/* :nodoc: */
-
-static VALUE
-vips_read_internal(VALUE obj, VALUE path)
-{
-    VipsImage *im;
-
-    if (!(im = (VipsImage *)im_open(StringValuePtr(path),"r")))
+    if (im_raw2vips(StringValuePtr(path), im_new, 
+		NUM2INT(width), NUM2INT(height), NUM2INT(bpp), NUM2INT(offset))) {
+		im_close(im_new);
         vips_lib_error();
+	}
 
-    return img_init(cVIPSImage, im);
+	return img_init(cVIPSImage, im_new);
 }
 
 static void
@@ -217,7 +81,7 @@ reader_fmt_set(VALUE klass, const char* val)
  */
 
 void
-init_Reader()
+init_Reader(void)
 {
     id_iv__vips_fmt = rb_intern("@_vips_fmt");
 
@@ -226,15 +90,13 @@ init_Reader()
     rb_define_alloc_func(reader, img_alloc);
 
     rb_define_singleton_method(reader, "recognized?", reader_s_recognized_p, 1);
-    rb_define_private_method(reader, "read_header", reader_read_header, 1);
-    rb_define_private_method(reader, "read_internal", reader_read_internal, 1);
+    rb_define_private_method(reader, "read_internal", reader_read_internal, 2);
 
     /*
      * Read JPEG images.
      */
 
     VALUE jpeg_reader = rb_define_class_under(mVIPS, "JPEGReader", reader);
-    rb_define_private_method(jpeg_reader, "read_internal", jpeg_read_internal, 1);
     reader_fmt_set(jpeg_reader, "jpeg");
 
     /*
@@ -242,7 +104,6 @@ init_Reader()
      */
 
     VALUE tiff_reader = rb_define_class_under(mVIPS, "TIFFReader", reader);
-    rb_define_private_method(tiff_reader, "read_internal", tiff_read_internal, 1);
     reader_fmt_set(tiff_reader, "tiff");
 
     /*
@@ -250,7 +111,6 @@ init_Reader()
      */
 
     VALUE ppm_reader = rb_define_class_under(mVIPS, "PPMReader", reader);
-    rb_define_private_method(ppm_reader, "read_internal", ppm_read_internal, 1);
     reader_fmt_set(ppm_reader, "ppm");
 
     /*
@@ -258,7 +118,6 @@ init_Reader()
      */
 
     VALUE png_reader = rb_define_class_under(mVIPS, "PNGReader", reader);
-    rb_define_private_method(png_reader, "read_internal", png_read_internal, 1);
     reader_fmt_set(png_reader, "png");
 
     /*
@@ -266,7 +125,6 @@ init_Reader()
      */
 
     VALUE csv_reader = rb_define_class_under(mVIPS, "CSVReader", reader);
-    rb_define_private_method(csv_reader, "read_internal", csv_read_internal, 1);
     reader_fmt_set(csv_reader, "csv");
 
     /*
@@ -274,7 +132,6 @@ init_Reader()
      */
 
     VALUE exr_reader = rb_define_class_under(mVIPS, "EXRReader", reader);
-    rb_define_private_method(exr_reader, "read_internal", exr_read_internal, 1);
     reader_fmt_set(exr_reader, "exr");
 
     /*
@@ -282,7 +139,6 @@ init_Reader()
      */
 
     VALUE vips_reader = rb_define_class_under(mVIPS, "VIPSReader", reader);
-    rb_define_private_method(vips_reader, "read_internal", vips_read_internal, 1);
     reader_fmt_set(vips_reader, "vips");
 
     /*
@@ -290,7 +146,6 @@ init_Reader()
      */
 
     VALUE magick_reader = rb_define_class_under(mVIPS, "MagickReader", reader);
-    rb_define_private_method(magick_reader, "read_internal", magick_read_internal, 1);
     reader_fmt_set(magick_reader, "magick");
 
     /*
@@ -298,7 +153,6 @@ init_Reader()
      */
 
     VALUE analyze_reader = rb_define_class_under(mVIPS, "AnalyzeReader", reader);
-    rb_define_private_method(analyze_reader, "read_internal", analyze_read_internal, 1);
     reader_fmt_set(analyze_reader, "analyze");
 
     /*

data/ext/reader.h

@@ -0,0 +1,2 @@
+void init_Reader(void);
+

data/ext/ruby_vips.c

@@ -42,19 +42,6 @@ vips_s_debug_info(VALUE obj)
     return Qnil;
 }
 
-/*
- * This method will kill the ruby interpreter and then invokes im__print_all()
- * to hunt for dangling Vips allocations.
- */
-static VALUE
-vips_exit_info(VALUE obj)
-{
-    ruby_finalize();
-    im__print_all();
-    exit(0);
-    return Qnil;
-}
-
 /*
  * Build a call to im_init_world() and pass command line options to vips. This
  * sets some library wide options.

data/ext/ruby_vips.h

@@ -1,13 +1,18 @@
 #ifndef RUBY_VIPS_H
 #define RUBY_VIPS_H
 
-#include "ruby.h"
-#include "vips/vips.h"
+#include <ruby.h>
+#include <vips/vips.h>
 
 extern VALUE mVIPS, eVIPSError;
 
 void vips_lib_error();
 
+/* If we're not using GNU C, elide __attribute__ */
+#ifndef __GNUC__
+#  define  __attribute__(x)  /*NOTHING*/
+#endif
+
 /* Backports from ruby 1.9.2 for ruby 1.8.7
  */
 
@@ -23,4 +28,22 @@ void vips_lib_error();
 #define rb_str_new_cstr(str) rb_str_new(str, (long)strlen(str))
 #endif
 
+#include "header.h"
+#include "image_arithmetic.h"
+#include "image_boolean.h"
+#include "image_colour.h"
+#include "image_conversion.h"
+#include "image_convolution.h"
+#include "image_freq_filt.h"
+#include "image.h"
+#include "image_histograms_lut.h"
+#include "image_morphology.h"
+#include "image_mosaicing.h"
+#include "image_relational.h"
+#include "image_resample.h"
+#include "interpolator.h"
+#include "mask.h"
+#include "reader.h"
+#include "writer.h"
+
 #endif

data/ext/writer.c

@@ -1,6 +1,4 @@
 #include "ruby_vips.h"
-#include "image.h"
-#include "header.h"
 
 /* :nodoc: */
 
@@ -144,25 +142,15 @@ writer_write_internal(VALUE obj, VALUE path)
 static VALUE
 jpeg_buf_internal(VALUE obj, VALUE quality)
 {
-    VipsImage *im_out;
     char *buf = NULL;
     int length;
-    VALUE str;
 
     GetImg(obj, data, im);
 
-    if (!(im_out = im_open("writer_jpeg_buf", "p")))
+    if (im_vips2bufjpeg(im, NULL, NUM2INT(quality), &buf, &length)) 
         vips_lib_error();
 
-    if (im_vips2bufjpeg(im, im_out, NUM2INT(quality), &buf, &length)) {
-		im_close(im_out);
-        vips_lib_error();
-	}
-
-    str = rb_tainted_str_new(buf, length);
-    im_close(im_out);
-
-    return str;
+    return rb_tainted_str_new(buf, length);
 }
 
 /* :nodoc: */
@@ -210,21 +198,13 @@ static VALUE
 png_buf_internal(VALUE obj, VALUE compression, VALUE interlace)
 {
 #if IM_MAJOR_VERSION > 7 || IM_MINOR_VERSION >= 23
-    VipsImage *im_out;
     char *buf;
     size_t length;
     GetImg(obj, data, im);
 
-    if (!(im_out = im_open("writer_png_buf", "p")))
-        vips_lib_error();
-
-    if (im_vips2bufpng(im, im_out, NUM2INT(compression), NUM2INT(interlace),
-        &buf, &length)) {
-        im_close(im_out);
+    if (im_vips2bufpng(im, NULL, NUM2INT(compression), NUM2INT(interlace),
+        &buf, &length)) 
         vips_lib_error();
-	}
-
-    im_close(im_out);
 
     return rb_tainted_str_new(buf, length);
 #else
@@ -282,7 +262,7 @@ vips_write_internal(VALUE obj, VALUE path)
  */
 
 void
-init_Writer()
+init_Writer(void)
 {
     VALUE writer = rb_define_class_under(mVIPS, "Writer", rb_cObject);