image_intensities 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8398631d7952cf4f4cd00e928b433386d2bdbbd0fbdfef4526168f197966f182
-  data.tar.gz: 5a549a6030aeb1d6f7e676107957c0910001bb1c2dd34692a48a879a7e59ee3f
+  metadata.gz: 464455d1063af5fd09dba024cfd681137290db2c3294d97ad36d20bef49b74a8
+  data.tar.gz: 2f60420eb22106e56d85d54d11f659461894ea2542dcdb6299f7ff0e4548d52f
 SHA512:
-  metadata.gz: cb7ce24fa53c0ddf75b0b859540eeea5df9512678fb1189be54e5cd0360263f5d0c0998c6eb70e2641995f94179453b9b4455f6b3bcc43c56cf09222b444f24c
-  data.tar.gz: e2469ecec6b847ece09d7bf835bc12dfc9e280c0d972e2c227d70edd8a4ccd34742711a3fb5458f2a6857d33eabdf2fd4785c2b549a5745db21eec8e423c73d7
+  metadata.gz: 8146a851d0d1d7f615e9f03d3b17d66dbf32d5dfafb46cededb3063da8ca4d4261625f5927d62f39ac9b7d4e4229cb31a5776ea6b580415dfb32e25e9d969a74
+  data.tar.gz: 77a2ccd9318bbc4f17c615f44f8b61b19689695185b1ef05ca4b16f7e7c8784c0e4a5dfcc2fe39c2193c2cfe8fdfa207bdbecef7dafe3bbf8966c399b9fe4ad8

data/ext/image_intensities/Makefile

@@ -8,7 +8,7 @@ all: lib/libimage_intensities.so
 
 lib/libimage_intensities.so: definitions.h intensities.c png.c jpeg.c
 	$(MKDIR) -p lib
-	$(CC) intensities.c png.c jpeg.c -fPIC -shared -o lib/libimage_intensities.so -ljpeg -lpng
+	$(CC) intensities.c png.c jpeg.c -fPIC -shared -o lib/libimage_intensities.so -lturbojpeg -lpng
 
 clean:
 	rm -rf lib

data/ext/image_intensities/jpeg.c

@@ -1,71 +1,60 @@
-#include <stdio.h>
-#include <stdint.h>
-#include <stdlib.h>
 #include <stddef.h>
+#include <stdlib.h>
+#include <turbojpeg.h>
 #include <fcntl.h>
-#include <string.h>
-#include <jpeglib.h>
-#include <setjmp.h>
+#include <unistd.h>
+#include <sys/mman.h>
 
 #include "definitions.h"
 
-struct my_error_mgr {
-    struct jpeg_error_mgr pub;
-    jmp_buf setjmp_buffer;
-};
-
-static void my_error_exit(j_common_ptr cinfo)
-{
-    struct my_error_mgr *myerr = (struct my_error_mgr *) cinfo->err;
-    longjmp(myerr->setjmp_buffer, 1);
-}
-
 raster_data read_jpeg_file(const char *file_name)
 {
-    struct jpeg_decompress_struct cinfo;
-    struct my_error_mgr jerr;
-    FILE *file;
-    JSAMPARRAY buffer;
-    int row_stride;
-
     raster_data data = {};
-
-    file = fopen(file_name, "rb");
-    if (file == NULL) {
-        data.error = 1;
-        return data;        
+    tjhandle decompressor = NULL;
+    void *input = NULL;
+    off_t size = 0;
+    int fd = -1;
+    int error = 0;
+    int jpegSubsamp;
+
+    fd = open(file_name, 0);
+    if (fd < 0) {
+        error = 1;
+        goto cleanup;
     }
 
-    cinfo.err = jpeg_std_error(&jerr.pub);
-    jerr.pub.error_exit = my_error_exit;
-
-    if (setjmp(jerr.setjmp_buffer)) {
-        jpeg_destroy_decompress(&cinfo);
-        fclose(file);
+    if ((size = lseek(fd, 0, SEEK_END)) < 0) {
+        error = 1;
+        goto cleanup;
+    }
 
-        return data;
+    if ((input = mmap(NULL, size, PROT_READ, MAP_SHARED, fd, 0)) == NULL) {
+        error = 1;
+        goto cleanup;
     }
 
-    jpeg_create_decompress(&cinfo);
-    jpeg_stdio_src(&cinfo, file);
-    jpeg_read_header(&cinfo, TRUE);
-    jpeg_start_decompress(&cinfo);
+    if ((decompressor = tjInitDecompress()) == NULL) {
+        error = 1;
+        goto cleanup;
+    }
 
-    data.width  = cinfo.output_width;
-    data.height = cinfo.output_height;
-    data.pixels = malloc(cinfo.output_components * cinfo.output_width * cinfo.output_height);
+    if ((tjDecompressHeader2(decompressor, input, size, &data.width, &data.height, &jpegSubsamp)) < 0) {
+        error = 1;
+        goto cleanup;
+    }
 
-    row_stride = cinfo.output_width * cinfo.output_components;
-    buffer = (*cinfo.mem->alloc_sarray)((j_common_ptr) &cinfo, JPOOL_IMAGE, row_stride, 1);
+    data.pixels = malloc(data.width * data.height * sizeof(rgb_pixel));
 
-    for (size_t i = 0; cinfo.output_scanline < cinfo.output_height; ++i) {
-        jpeg_read_scanlines(&cinfo, buffer, 1);
-        memcpy(&data.pixels[i * cinfo.output_width], buffer[0], row_stride);
+    if ((tjDecompress2(decompressor, input, size, (uint8_t *) data.pixels, data.width, 0, data.height, TJPF_RGB, TJFLAG_FASTDCT)) < 0) {
+        error = 1;
+        goto cleanup;
     }
 
-    jpeg_finish_decompress(&cinfo);
-    jpeg_destroy_decompress(&cinfo);
-    fclose(file);
+cleanup:
+    if (decompressor) tjDestroy(decompressor);
+    if (input) munmap(input, size);
+    if (fd >= 0) close(fd);
 
+    data.error = error;
     return data;
 }

data/lib/image_intensities/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ImageIntensities
-  VERSION = '1.0.2'
+  VERSION = '1.0.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: image_intensities
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Liam P. White
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-03 00:00:00.000000000 Z
+date: 2019-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi