rfreeimage 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f1966079f9e10d783543577040e00a934b11dfd7
-  data.tar.gz: 5662dfe703c70495676d945bdaa24e0b92fef816
+  metadata.gz: dea720ff7ff2d05a1a87c52999ad187daacc09d1
+  data.tar.gz: 4c617e08df0c12dfc6cb791264a4388a61194375
 SHA512:
-  metadata.gz: 82c912070bb034f7ee8ee955ab13945b2018f57cc47c8f8bf77a3d239d8c80fa82dadc8cdd2e32ccee20ecc759a9170a1fb8379525398d3e4759cbd1b520ed01
-  data.tar.gz: bda3b9a43fc0418ce7de317c151927cb91a40db8895275520377daf1efc6ccd4d02132c7f9eef58ff8259a5e12706cdda40806316a003e124490a917e8dd55f8
+  metadata.gz: 4f226e0e67c1e32cdc83a5b8c12009fe56db8a5d1699a9acb7db78bdf9b14b18caec5dd4a720eefb09ea704b1ca3fc77da4b20720ce195a28a703890835a7726
+  data.tar.gz: ad4c922848a717c938b05511424e170754eff6f1bac293e0f38f1d872a62d93bad999b017ed84bc5466840b56204bfe523723be7c9ac3b3968064a33108e05c6

data/ext/rfreeimage/rfi_main.c

@@ -85,7 +85,8 @@ convert_bpp(FIBITMAP *orig, unsigned int bpp) {
 }
 
 static void
-rd_image(VALUE clazz, VALUE file, struct native_image *img, unsigned int bpp, BOOL ping)
+rd_image(VALUE clazz, VALUE file, struct native_image *img, unsigned int bpp, BOOL ping,
+		int max_size_hint)
 {
 	char *filename;
 	int flags = 0;
@@ -99,8 +100,11 @@ rd_image(VALUE clazz, VALUE file, struct native_image *img, unsigned int bpp, BO
 		free(filename);
 		rb_raise(rb_eIOError, "Invalid image file");
 	}
+	if (max_size_hint < 0 || max_size_hint > 65535)
+		rb_raise(rb_eArgError, "Invalid max_size_hint");
 
 	if (ping) flags |= FIF_LOAD_NOPIXELS;
+	if (!ping) flags |= max_size_hint << 16;
 	// use JPEG_ACCURATE to keep sync with opencv
 	if (in_fif == FIF_JPEG)
 		flags |= JPEG_EXIFROTATE | JPEG_ACCURATE;
@@ -125,7 +129,7 @@ rd_image(VALUE clazz, VALUE file, struct native_image *img, unsigned int bpp, BO
 }
 
 static void
-rd_image_blob(VALUE clazz, VALUE blob, struct native_image *img, unsigned int bpp, BOOL ping)
+rd_image_blob(VALUE clazz, VALUE blob, struct native_image *img, unsigned int bpp, BOOL ping, int max_size_hint)
 {
 	FIBITMAP *h = NULL, *orig = NULL;
 	FIMEMORY *fmh;
@@ -140,8 +144,11 @@ rd_image_blob(VALUE clazz, VALUE blob, struct native_image *img, unsigned int bp
 		FreeImage_CloseMemory(fmh);
 		rb_raise(rb_eIOError, "Invalid image blob");
 	}
+	if (max_size_hint < 0 || max_size_hint > 65535)
+		rb_raise(rb_eArgError, "Invalid max_size_hint");
 
 	if (ping) flags |= FIF_LOAD_NOPIXELS;
+	if (!ping) flags |= max_size_hint << 16;
 	if (in_fif == FIF_JPEG)
 		flags |= JPEG_EXIFROTATE | JPEG_ACCURATE;
 	orig = FreeImage_LoadFromMemory(in_fif, fmh, flags);
@@ -174,10 +181,13 @@ VALUE Image_initialize(int argc, VALUE *argv, VALUE self)
 	switch (argc)
 	{
 		case 1:
-			rd_image(self, argv[0], img, 0, 0);
+			rd_image(self, argv[0], img, 0, 0, 0);
 			break;
 		case 2:
-			rd_image(self, argv[0], img, NUM2INT(argv[1]), 0);
+			rd_image(self, argv[0], img, NUM2INT(argv[1]), 0, 0);
+			break;
+		case 3:
+			rd_image(self, argv[0], img, NUM2INT(argv[1]), 0, NUM2INT(argv[2]));
 			break;
 		default:
 			rb_raise(rb_eArgError, "wrong number of arguments (%d for 1)", argc);
@@ -437,6 +447,60 @@ VALUE Image_rescale(VALUE self, VALUE dst_width, VALUE dst_height, VALUE filter_
 	return rfi_get_image(nh);
 }
 
+VALUE Image_downscale(VALUE self, VALUE max_size) {
+	// down-sample resize
+	struct native_image *img;
+	FIBITMAP *nh;
+	int i;
+	int j;
+	int w;
+	int h;
+	int scale;
+	int mlen;
+	int msize = NUM2INT(max_size);
+
+	Data_Get_Struct(self, struct native_image, img);
+	RFI_CHECK_IMG(img);
+
+	mlen = img->w > img->h ? img->w : img->h;
+	if (msize <= 0 || msize >= mlen) {
+		nh = FreeImage_Copy(img->handle, 0, 0, img->w, img->h);
+	} else {
+		unsigned char *ph;
+		unsigned char *pnh;
+		int dst_stride;
+		if (img->bpp != 8 && img->bpp != 32)
+			rb_raise(rb_eArgError, "bpp not supported");
+
+		scale = (mlen + msize - 1)  / msize;
+		w = img->w / scale;
+		h = img->h / scale;
+		nh = FreeImage_Allocate(w, h, img->bpp, 0, 0, 0);
+		if (!nh)
+			rb_raise(rb_eArgError, "fail to allocate image");
+
+		ph = FreeImage_GetBits(img->handle);
+		pnh = FreeImage_GetBits(nh);
+		dst_stride = FreeImage_GetPitch(nh);
+		if (img->bpp == 8) {
+			for(i = 0; i < h; i++) {
+				for(j = 0; j < w; j++)
+					*(pnh + j) = *(ph + j * scale);
+				ph += img->stride * scale;
+				pnh += dst_stride;
+			}
+		} else if (img->bpp == 32) {
+			for(i = 0; i < h; i++) {
+				for(j = 0; j < w; j++)
+					*((unsigned int*)pnh + j) = *((unsigned int*)ph + j * scale);
+				ph += img->stride * scale;
+				pnh += dst_stride;
+			}
+		}
+	}
+	return rfi_get_image(nh);
+}
+
 VALUE Image_crop(VALUE self, VALUE _left, VALUE _top, VALUE _right, VALUE _bottom)
 {
 	struct native_image *img;
@@ -466,7 +530,7 @@ VALUE Image_ping(VALUE self, VALUE file)
 {
 	ALLOC_NEW_IMAGE(v, img);
 
-	rd_image(self, file, img, 0, 1);
+	rd_image(self, file, img, 0, 1, 0);
 	if (img->handle)
 		FreeImage_Unload(img->handle);
 	img->handle = NULL;
@@ -481,10 +545,13 @@ VALUE Image_from_blob(int argc, VALUE *argv, VALUE self)
 	switch (argc)
 	{
 		case 1:
-			rd_image_blob(self, argv[0], img, 0, 0);
+			rd_image_blob(self, argv[0], img, 0, 0, 0);
 			break;
 		case 2:
-			rd_image_blob(self, argv[0], img, NUM2INT(argv[1]), 0);
+			rd_image_blob(self, argv[0], img, NUM2INT(argv[1]), 0, 0);
+			break;
+		case 3:
+			rd_image_blob(self, argv[0], img, NUM2INT(argv[1]), 0, NUM2INT(argv[2]));
 			break;
 		default:
 			rb_raise(rb_eArgError, "wrong number of arguments (%d for 1)", argc);
@@ -498,7 +565,7 @@ VALUE Image_ping_blob(VALUE self, VALUE blob)
 {
 	ALLOC_NEW_IMAGE(v, img);
 
-	rd_image_blob(self, blob, img, 0, 1);
+	rd_image_blob(self, blob, img, 0, 1, 0);
 	if (img->handle)
 		FreeImage_Unload(img->handle);
 	img->handle = NULL;
@@ -635,6 +702,7 @@ void Init_rfreeimage(void)
 	rb_define_method(Class_Image, "to_bpp", Image_to_bpp, 1);
 	rb_define_method(Class_Image, "rotate", Image_rotate, 1);
 	rb_define_method(Class_Image, "rescale", Image_rescale, 3);
+	rb_define_method(Class_Image, "downscale", Image_downscale, 1);
 	rb_define_method(Class_Image, "crop", Image_crop, 4);
 	rb_define_method(Class_Image, "to_blob", Image_to_blob, 1);
 

data/lib/rfreeimage/image.rb

@@ -54,8 +54,27 @@ module RFreeImage
 			return self.rescale(width, height, filter)
 		end
 
+    def self.load_downscale file, max_size
+      # only work on jpeg
+      img = Image.new file, 0, max_size
+      _downscale_nocopy img, max_size
+    end
+
+    def self.from_blob_downscale blob, max_size
+      # only work on jpeg
+      img = Image.from_blob blob, 0, max_size
+      _downscale_nocopy img, max_size
+    end
 
 		alias_method :write, :save
 		alias_method :columns, :cols
-	end
+
+    private
+    def self._downscale_nocopy img, max_size
+      return img if img.cols <= max_size && img.rows <= max_size
+      nimg = img.downscale max_size
+      img.destroy!
+      nimg
+    end
+  end
 end

data/lib/rfreeimage/version.rb

@@ -1,3 +1,3 @@
 module RFreeImage
-	VERSION = '0.1.6'
+	VERSION = '0.1.7'
 end

metadata

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