rfreeimage 0.1.1 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d8d7e7bca8f13f158da2617a15667627c8a0c31a
-  data.tar.gz: 638dacb99a69891c7cbd5112e31a4c9b13e28680
+  metadata.gz: da114f86318598af6b06aa737c0fed85bf78887a
+  data.tar.gz: 662cebc27f59581a9629a1dc95ad834577d3f76b
 SHA512:
-  metadata.gz: af82826b1c9556159e616dca72a0e639dd7897b8aa9e00934cd2ffb62e24710b9f2956afae22ecb862f63548bb2b48754e760dda623b07e7fe4b4079cb0884e5
-  data.tar.gz: cdab92f66f9dcb575d3d429e63e3eaef0b8c5770ae703ddab435a244a4972d19bd496662de6a7483beaaf9efcff0948baaaf695018df1c5dfd5c41f611cc5d70
+  metadata.gz: 24f80a22be77f83cbaf072b5d755f58fd0758eb17f3bb1dfff4ac4497c5d55a3da6c9c64341f999814a7ae469020a0a76aacc9adf142ba663ab217ae25acbb23
+  data.tar.gz: 07af6587e3247f9e74db0cab5471a34571fecef781704c58e675b27a1a463dcd8564de14f7394d38f038408b041b46f6047a7c50c7b4b561b9d19ab02f165d8c

data/ext/rfreeimage/extconf.rb

@@ -6,6 +6,7 @@ $CFLAGS << " #{ENV["CFLAGS"]}"
 $CFLAGS << " -g"
 $CFLAGS << " -O3" unless $CFLAGS[/-O\d/]
 $CFLAGS << " -Wall -Wno-comment"
+$LDFLAGS << "-Wl,--exclude-libs=ALL"
 
 def sys(cmd)
 	puts " -- #{cmd}"

data/ext/rfreeimage/rfi_main.c

@@ -218,6 +218,53 @@ VALUE Image_save(VALUE self, VALUE file)
 	return Qnil;
 }
 
+VALUE Image_to_blob(VALUE self, VALUE type)
+{
+	char *filetype;
+	struct native_image* img;
+	FIMEMORY *hmem;
+	BOOL result;
+	FREE_IMAGE_FORMAT out_fif;
+	VALUE ret;
+	BYTE *raw = NULL;
+	DWORD file_size;
+
+	Data_Get_Struct(self, struct native_image, img);
+	RFI_CHECK_IMG(img);
+
+	Check_Type(type, T_STRING);
+	filetype = rfi_value_to_str(type);
+
+	out_fif = FreeImage_GetFIFFromFormat(filetype);
+	free(filetype);
+	if (out_fif == FIF_UNKNOWN)
+		rb_raise(Class_RFIError, "Invalid format");
+
+	hmem = FreeImage_OpenMemory(0, 0);
+	if (!hmem)
+		rb_raise(rb_eIOError, "Fail to allocate blob");
+	if (out_fif == FIF_JPEG && img->bpp != 8 && img->bpp != 24) {
+		FIBITMAP *to_save = FreeImage_ConvertTo24Bits(img->handle);
+		result = FreeImage_SaveToMemory(out_fif, to_save, hmem, JPEG_BASELINE);
+		FreeImage_Unload(to_save);
+	} else {
+		result = FreeImage_SaveToMemory(out_fif, img->handle, hmem, 0);
+	}
+
+	if(!result) {
+		FreeImage_CloseMemory(hmem);
+		rb_raise(rb_eIOError, "Fail to save image to blob");
+	}
+	file_size = FreeImage_TellMemory(hmem);
+	FreeImage_SeekMemory(hmem, 0, SEEK_SET);
+	FreeImage_AcquireMemory(hmem, &raw, &file_size);
+	ret = rb_str_new((char*)raw, (long)file_size);
+	FreeImage_CloseMemory(hmem);
+	return ret;
+}
+
+
+
 
 VALUE Image_cols(VALUE self)
 {
@@ -449,6 +496,49 @@ VALUE Image_ping_blob(VALUE self, VALUE blob)
 	return v;
 }
 
+VALUE Image_from_bytes(VALUE self, VALUE bytes, VALUE width,
+		VALUE height, VALUE stride, VALUE bpp)
+{
+	long f_len;
+	int _bpp = NUM2INT(bpp);
+	char *ptr;
+	unsigned char *p;
+	int i;
+	int src_stride = NUM2INT(stride);
+	FIBITMAP *h;
+
+	ALLOC_NEW_IMAGE(v, img);
+
+	if (_bpp != 8 && _bpp != 32)
+		rb_raise(rb_eArgError, "bpp must be 8 or 32");
+	Check_Type(bytes, T_STRING);
+	f_len = RSTRING_LEN(bytes);
+	if (f_len < (long)src_stride * NUM2INT(height))
+		rb_raise(rb_eArgError, "buffer too small");
+
+	h = FreeImage_Allocate(NUM2INT(width), NUM2INT(height), _bpp, 0, 0, 0);
+	if (!h)
+		rb_raise(rb_eArgError, "fail to allocate image");
+
+	img->handle = h;
+	img->w = FreeImage_GetWidth(h);
+	img->h = FreeImage_GetHeight(h);
+	img->bpp = FreeImage_GetBPP(h);
+	img->stride = FreeImage_GetPitch(h);
+	img->fif = FIF_BMP;
+
+	/* up-side-down */
+	p = FreeImage_GetBits(img->handle);
+	ptr = RSTRING_PTR(bytes) + img->h * src_stride;
+	for(i = 0; i < img->h; i++) {
+		ptr -= src_stride;
+		memcpy(p, ptr, img->stride);
+		p += img->stride;
+	}
+
+	return v;
+}
+
 /* draw */
 VALUE Image_draw_point(VALUE self, VALUE _x, VALUE _y, VALUE color, VALUE _size)
 {
@@ -536,6 +626,7 @@ void Init_rfreeimage(void)
 	rb_define_method(Class_Image, "rotate", Image_rotate, 1);
 	rb_define_method(Class_Image, "resize", Image_resize, 2);
 	rb_define_method(Class_Image, "crop", Image_crop, 4);
+	rb_define_method(Class_Image, "to_blob", Image_to_blob, 1);
 
 	/* draw */
 	rb_define_method(Class_Image, "draw_point", Image_draw_point, 4);
@@ -544,4 +635,5 @@ void Init_rfreeimage(void)
 	rb_define_singleton_method(Class_Image, "ping", Image_ping, 1);
 	rb_define_singleton_method(Class_Image, "from_blob", Image_from_blob, -1);
 	rb_define_singleton_method(Class_Image, "ping_blob", Image_ping_blob, 1);
+	rb_define_singleton_method(Class_Image, "from_bytes", Image_from_bytes, 5);
 }

data/lib/rfreeimage/version.rb

@@ -1,3 +1,3 @@
 module RFreeImage
-	VERSION = '0.1.1'
+	VERSION = '0.1.3'
 end

data/vendor/FreeImage/Source/LibRawLite/internal/libraw_x3f.cpp

@@ -1,4 +1,4 @@
-/* Library for accessing X3F Files 
+/* Library for accessing X3F Files 
 ----------------------------------------------------------------
 BSD-style License
 ----------------------------------------------------------------

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rfreeimage
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.3
 platform: ruby
 authors:
 - Yuheng Chen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-02 00:00:00.000000000 Z
+date: 2015-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler