image_intensities 1.0.3 → 1.0.4

data/ext/image_intensities/turbojpeg/wrppm.c

@@ -0,0 +1,365 @@
+/*
+ * wrppm.c
+ *
+ * This file was part of the Independent JPEG Group's software:
+ * Copyright (C) 1991-1996, Thomas G. Lane.
+ * Modified 2009 by Guido Vollbeding.
+ * libjpeg-turbo Modifications:
+ * Copyright (C) 2017, 2019, D. R. Commander.
+ * For conditions of distribution and use, see the accompanying README.ijg
+ * file.
+ *
+ * This file contains routines to write output images in PPM/PGM format.
+ * The extended 2-byte-per-sample raw PPM/PGM formats are supported.
+ * The PBMPLUS library is NOT required to compile this software
+ * (but it is highly useful as a set of PPM image manipulation programs).
+ *
+ * These routines may need modification for non-Unix environments or
+ * specialized applications.  As they stand, they assume output to
+ * an ordinary stdio stream.
+ */
+
+#include "cmyk.h"
+#include "cdjpeg.h"             /* Common decls for cjpeg/djpeg applications */
+
+#ifdef PPM_SUPPORTED
+
+
+/*
+ * For 12-bit JPEG data, we either downscale the values to 8 bits
+ * (to write standard byte-per-sample PPM/PGM files), or output
+ * nonstandard word-per-sample PPM/PGM files.  Downscaling is done
+ * if PPM_NORAWWORD is defined (this can be done in the Makefile
+ * or in jconfig.h).
+ * (When the core library supports data precision reduction, a cleaner
+ * implementation will be to ask for that instead.)
+ */
+
+#if BITS_IN_JSAMPLE == 8
+#define PUTPPMSAMPLE(ptr, v)  *ptr++ = (char)(v)
+#define BYTESPERSAMPLE  1
+#define PPM_MAXVAL  255
+#else
+#ifdef PPM_NORAWWORD
+#define PUTPPMSAMPLE(ptr, v)  *ptr++ = (char)((v) >> (BITS_IN_JSAMPLE - 8))
+#define BYTESPERSAMPLE  1
+#define PPM_MAXVAL  255
+#else
+/* The word-per-sample format always puts the MSB first. */
+#define PUTPPMSAMPLE(ptr, v) { \
+  register int val_ = v; \
+  *ptr++ = (char)((val_ >> 8) & 0xFF); \
+  *ptr++ = (char)(val_ & 0xFF); \
+}
+#define BYTESPERSAMPLE  2
+#define PPM_MAXVAL  ((1 << BITS_IN_JSAMPLE) - 1)
+#endif
+#endif
+
+
+/*
+ * When JSAMPLE is the same size as char, we can just fwrite() the
+ * decompressed data to the PPM or PGM file.
+ */
+
+
+/* Private version of data destination object */
+
+typedef struct {
+  struct djpeg_dest_struct pub; /* public fields */
+
+  /* Usually these two pointers point to the same place: */
+  char *iobuffer;               /* fwrite's I/O buffer */
+  JSAMPROW pixrow;              /* decompressor output buffer */
+  size_t buffer_width;          /* width of I/O buffer */
+  JDIMENSION samples_per_row;   /* JSAMPLEs per output row */
+} ppm_dest_struct;
+
+typedef ppm_dest_struct *ppm_dest_ptr;
+
+
+/*
+ * Write some pixel data.
+ * In this module rows_supplied will always be 1.
+ *
+ * put_pixel_rows handles the "normal" 8-bit case where the decompressor
+ * output buffer is physically the same as the fwrite buffer.
+ */
+
+METHODDEF(void)
+put_pixel_rows(j_decompress_ptr cinfo, djpeg_dest_ptr dinfo,
+               JDIMENSION rows_supplied)
+{
+  ppm_dest_ptr dest = (ppm_dest_ptr)dinfo;
+
+  (void)JFWRITE(dest->pub.output_file, dest->iobuffer, dest->buffer_width);
+}
+
+
+/*
+ * This code is used when we have to copy the data and apply a pixel
+ * format translation.  Typically this only happens in 12-bit mode.
+ */
+
+METHODDEF(void)
+copy_pixel_rows(j_decompress_ptr cinfo, djpeg_dest_ptr dinfo,
+                JDIMENSION rows_supplied)
+{
+  ppm_dest_ptr dest = (ppm_dest_ptr)dinfo;
+  register char *bufferptr;
+  register JSAMPROW ptr;
+#if BITS_IN_JSAMPLE != 8 || (!defined(HAVE_UNSIGNED_CHAR) && !defined(__CHAR_UNSIGNED__))
+  register JDIMENSION col;
+#endif
+
+  ptr = dest->pub.buffer[0];
+  bufferptr = dest->iobuffer;
+#if BITS_IN_JSAMPLE == 8 && (defined(HAVE_UNSIGNED_CHAR) || defined(__CHAR_UNSIGNED__))
+  MEMCOPY(bufferptr, ptr, dest->samples_per_row);
+#else
+  for (col = dest->samples_per_row; col > 0; col--) {
+    PUTPPMSAMPLE(bufferptr, GETJSAMPLE(*ptr++));
+  }
+#endif
+  (void)JFWRITE(dest->pub.output_file, dest->iobuffer, dest->buffer_width);
+}
+
+
+/*
+ * Convert extended RGB to RGB.
+ */
+
+METHODDEF(void)
+put_rgb(j_decompress_ptr cinfo, djpeg_dest_ptr dinfo, JDIMENSION rows_supplied)
+{
+  ppm_dest_ptr dest = (ppm_dest_ptr)dinfo;
+  register char *bufferptr;
+  register JSAMPROW ptr;
+  register JDIMENSION col;
+  register int rindex = rgb_red[cinfo->out_color_space];
+  register int gindex = rgb_green[cinfo->out_color_space];
+  register int bindex = rgb_blue[cinfo->out_color_space];
+  register int ps = rgb_pixelsize[cinfo->out_color_space];
+
+  ptr = dest->pub.buffer[0];
+  bufferptr = dest->iobuffer;
+  for (col = cinfo->output_width; col > 0; col--) {
+    PUTPPMSAMPLE(bufferptr, ptr[rindex]);
+    PUTPPMSAMPLE(bufferptr, ptr[gindex]);
+    PUTPPMSAMPLE(bufferptr, ptr[bindex]);
+    ptr += ps;
+  }
+  (void)JFWRITE(dest->pub.output_file, dest->iobuffer, dest->buffer_width);
+}
+
+
+/*
+ * Convert CMYK to RGB.
+ */
+
+METHODDEF(void)
+put_cmyk(j_decompress_ptr cinfo, djpeg_dest_ptr dinfo,
+         JDIMENSION rows_supplied)
+{
+  ppm_dest_ptr dest = (ppm_dest_ptr)dinfo;
+  register char *bufferptr;
+  register JSAMPROW ptr;
+  register JDIMENSION col;
+
+  ptr = dest->pub.buffer[0];
+  bufferptr = dest->iobuffer;
+  for (col = cinfo->output_width; col > 0; col--) {
+    JSAMPLE r, g, b, c = *ptr++, m = *ptr++, y = *ptr++, k = *ptr++;
+    cmyk_to_rgb(c, m, y, k, &r, &g, &b);
+    PUTPPMSAMPLE(bufferptr, r);
+    PUTPPMSAMPLE(bufferptr, g);
+    PUTPPMSAMPLE(bufferptr, b);
+  }
+  (void)JFWRITE(dest->pub.output_file, dest->iobuffer, dest->buffer_width);
+}
+
+
+/*
+ * Write some pixel data when color quantization is in effect.
+ * We have to demap the color index values to straight data.
+ */
+
+METHODDEF(void)
+put_demapped_rgb(j_decompress_ptr cinfo, djpeg_dest_ptr dinfo,
+                 JDIMENSION rows_supplied)
+{
+  ppm_dest_ptr dest = (ppm_dest_ptr)dinfo;
+  register char *bufferptr;
+  register int pixval;
+  register JSAMPROW ptr;
+  register JSAMPROW color_map0 = cinfo->colormap[0];
+  register JSAMPROW color_map1 = cinfo->colormap[1];
+  register JSAMPROW color_map2 = cinfo->colormap[2];
+  register JDIMENSION col;
+
+  ptr = dest->pub.buffer[0];
+  bufferptr = dest->iobuffer;
+  for (col = cinfo->output_width; col > 0; col--) {
+    pixval = GETJSAMPLE(*ptr++);
+    PUTPPMSAMPLE(bufferptr, GETJSAMPLE(color_map0[pixval]));
+    PUTPPMSAMPLE(bufferptr, GETJSAMPLE(color_map1[pixval]));
+    PUTPPMSAMPLE(bufferptr, GETJSAMPLE(color_map2[pixval]));
+  }
+  (void)JFWRITE(dest->pub.output_file, dest->iobuffer, dest->buffer_width);
+}
+
+
+METHODDEF(void)
+put_demapped_gray(j_decompress_ptr cinfo, djpeg_dest_ptr dinfo,
+                  JDIMENSION rows_supplied)
+{
+  ppm_dest_ptr dest = (ppm_dest_ptr)dinfo;
+  register char *bufferptr;
+  register JSAMPROW ptr;
+  register JSAMPROW color_map = cinfo->colormap[0];
+  register JDIMENSION col;
+
+  ptr = dest->pub.buffer[0];
+  bufferptr = dest->iobuffer;
+  for (col = cinfo->output_width; col > 0; col--) {
+    PUTPPMSAMPLE(bufferptr, GETJSAMPLE(color_map[GETJSAMPLE(*ptr++)]));
+  }
+  (void)JFWRITE(dest->pub.output_file, dest->iobuffer, dest->buffer_width);
+}
+
+
+/*
+ * Startup: write the file header.
+ */
+
+METHODDEF(void)
+start_output_ppm(j_decompress_ptr cinfo, djpeg_dest_ptr dinfo)
+{
+  ppm_dest_ptr dest = (ppm_dest_ptr)dinfo;
+
+  /* Emit file header */
+  switch (cinfo->out_color_space) {
+  case JCS_GRAYSCALE:
+    /* emit header for raw PGM format */
+    fprintf(dest->pub.output_file, "P5\n%ld %ld\n%d\n",
+            (long)cinfo->output_width, (long)cinfo->output_height, PPM_MAXVAL);
+    break;
+  case JCS_RGB:
+  case JCS_EXT_RGB:
+  case JCS_EXT_RGBX:
+  case JCS_EXT_BGR:
+  case JCS_EXT_BGRX:
+  case JCS_EXT_XBGR:
+  case JCS_EXT_XRGB:
+  case JCS_EXT_RGBA:
+  case JCS_EXT_BGRA:
+  case JCS_EXT_ABGR:
+  case JCS_EXT_ARGB:
+  case JCS_CMYK:
+    if (!IsExtRGB(cinfo->out_color_space) && cinfo->quantize_colors)
+      ERREXIT(cinfo, JERR_PPM_COLORSPACE);
+    /* emit header for raw PPM format */
+    fprintf(dest->pub.output_file, "P6\n%ld %ld\n%d\n",
+            (long)cinfo->output_width, (long)cinfo->output_height, PPM_MAXVAL);
+    break;
+  default:
+    ERREXIT(cinfo, JERR_PPM_COLORSPACE);
+  }
+}
+
+
+/*
+ * Finish up at the end of the file.
+ */
+
+METHODDEF(void)
+finish_output_ppm(j_decompress_ptr cinfo, djpeg_dest_ptr dinfo)
+{
+  /* Make sure we wrote the output file OK */
+  fflush(dinfo->output_file);
+  if (ferror(dinfo->output_file))
+    ERREXIT(cinfo, JERR_FILE_WRITE);
+}
+
+
+/*
+ * Re-calculate buffer dimensions based on output dimensions.
+ */
+
+METHODDEF(void)
+calc_buffer_dimensions_ppm(j_decompress_ptr cinfo, djpeg_dest_ptr dinfo)
+{
+  ppm_dest_ptr dest = (ppm_dest_ptr)dinfo;
+
+  if (cinfo->out_color_space == JCS_GRAYSCALE)
+    dest->samples_per_row = cinfo->output_width * cinfo->out_color_components;
+  else
+    dest->samples_per_row = cinfo->output_width * 3;
+  dest->buffer_width = dest->samples_per_row * (BYTESPERSAMPLE * sizeof(char));
+}
+
+
+/*
+ * The module selection routine for PPM format output.
+ */
+
+GLOBAL(djpeg_dest_ptr)
+jinit_write_ppm(j_decompress_ptr cinfo)
+{
+  ppm_dest_ptr dest;
+
+  /* Create module interface object, fill in method pointers */
+  dest = (ppm_dest_ptr)
+      (*cinfo->mem->alloc_small) ((j_common_ptr)cinfo, JPOOL_IMAGE,
+                                  sizeof(ppm_dest_struct));
+  dest->pub.start_output = start_output_ppm;
+  dest->pub.finish_output = finish_output_ppm;
+  dest->pub.calc_buffer_dimensions = calc_buffer_dimensions_ppm;
+
+  /* Calculate output image dimensions so we can allocate space */
+  jpeg_calc_output_dimensions(cinfo);
+
+  /* Create physical I/O buffer */
+  dest->pub.calc_buffer_dimensions(cinfo, (djpeg_dest_ptr)dest);
+  dest->iobuffer = (char *)(*cinfo->mem->alloc_small)
+    ((j_common_ptr)cinfo, JPOOL_IMAGE, dest->buffer_width);
+
+  if (cinfo->quantize_colors || BITS_IN_JSAMPLE != 8 ||
+      sizeof(JSAMPLE) != sizeof(char) ||
+      (cinfo->out_color_space != JCS_EXT_RGB
+#if RGB_RED == 0 && RGB_GREEN == 1 && RGB_BLUE == 2 && RGB_PIXELSIZE == 3
+       && cinfo->out_color_space != JCS_RGB
+#endif
+      )) {
+    /* When quantizing, we need an output buffer for colormap indexes
+     * that's separate from the physical I/O buffer.  We also need a
+     * separate buffer if pixel format translation must take place.
+     */
+    dest->pub.buffer = (*cinfo->mem->alloc_sarray)
+      ((j_common_ptr)cinfo, JPOOL_IMAGE,
+       cinfo->output_width * cinfo->output_components, (JDIMENSION)1);
+    dest->pub.buffer_height = 1;
+    if (!cinfo->quantize_colors) {
+      if (IsExtRGB(cinfo->out_color_space))
+        dest->pub.put_pixel_rows = put_rgb;
+      else if (cinfo->out_color_space == JCS_CMYK)
+        dest->pub.put_pixel_rows = put_cmyk;
+      else
+        dest->pub.put_pixel_rows = copy_pixel_rows;
+    } else if (cinfo->out_color_space == JCS_GRAYSCALE)
+      dest->pub.put_pixel_rows = put_demapped_gray;
+    else
+      dest->pub.put_pixel_rows = put_demapped_rgb;
+  } else {
+    /* We will fwrite() directly from decompressor output buffer. */
+    /* Synthesize a JSAMPARRAY pointer structure */
+    dest->pixrow = (JSAMPROW)dest->iobuffer;
+    dest->pub.buffer = &dest->pixrow;
+    dest->pub.buffer_height = 1;
+    dest->pub.put_pixel_rows = put_pixel_rows;
+  }
+
+  return (djpeg_dest_ptr)dest;
+}
+
+#endif /* PPM_SUPPORTED */

data/image_intensities.gemspec

@@ -6,7 +6,7 @@ Gem::Specification.new do |s|
   s.summary       = ''
   s.author        = 'Liam P. White'
   s.files         = `git ls-files`.split("\n")
-  s.license       = 'MIT'
+  s.license       = 'BSD'
   s.extensions    = %w[ext/Rakefile]
   s.require_paths = %w[lib]
 

data/lib/image_intensities/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: image_intensities
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Liam P. White
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-04 00:00:00.000000000 Z
+date: 2019-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -67,13 +67,101 @@ files:
 - ext/image_intensities/intensities.c
 - ext/image_intensities/jpeg.c
 - ext/image_intensities/png.c
+- ext/image_intensities/turbojpeg/cderror.h
+- ext/image_intensities/turbojpeg/cdjpeg.h
+- ext/image_intensities/turbojpeg/cmyk.h
+- ext/image_intensities/turbojpeg/jaricom.c
+- ext/image_intensities/turbojpeg/jcapimin.c
+- ext/image_intensities/turbojpeg/jcapistd.c
+- ext/image_intensities/turbojpeg/jcarith.c
+- ext/image_intensities/turbojpeg/jccoefct.c
+- ext/image_intensities/turbojpeg/jccolext.c
+- ext/image_intensities/turbojpeg/jccolor.c
+- ext/image_intensities/turbojpeg/jcdctmgr.c
+- ext/image_intensities/turbojpeg/jchuff.c
+- ext/image_intensities/turbojpeg/jchuff.h
+- ext/image_intensities/turbojpeg/jcicc.c
+- ext/image_intensities/turbojpeg/jcinit.c
+- ext/image_intensities/turbojpeg/jcmainct.c
+- ext/image_intensities/turbojpeg/jcmarker.c
+- ext/image_intensities/turbojpeg/jcmaster.c
+- ext/image_intensities/turbojpeg/jcomapi.c
+- ext/image_intensities/turbojpeg/jconfig.h
+- ext/image_intensities/turbojpeg/jconfigint.h
+- ext/image_intensities/turbojpeg/jcparam.c
+- ext/image_intensities/turbojpeg/jcphuff.c
+- ext/image_intensities/turbojpeg/jcprepct.c
+- ext/image_intensities/turbojpeg/jcsample.c
+- ext/image_intensities/turbojpeg/jctrans.c
+- ext/image_intensities/turbojpeg/jdapimin.c
+- ext/image_intensities/turbojpeg/jdapistd.c
+- ext/image_intensities/turbojpeg/jdarith.c
+- ext/image_intensities/turbojpeg/jdatadst-tj.c
+- ext/image_intensities/turbojpeg/jdatadst.c
+- ext/image_intensities/turbojpeg/jdatasrc-tj.c
+- ext/image_intensities/turbojpeg/jdatasrc.c
+- ext/image_intensities/turbojpeg/jdcoefct.c
+- ext/image_intensities/turbojpeg/jdcoefct.h
+- ext/image_intensities/turbojpeg/jdcol565.c
+- ext/image_intensities/turbojpeg/jdcolext.c
+- ext/image_intensities/turbojpeg/jdcolor.c
+- ext/image_intensities/turbojpeg/jdct.h
+- ext/image_intensities/turbojpeg/jddctmgr.c
+- ext/image_intensities/turbojpeg/jdhuff.c
+- ext/image_intensities/turbojpeg/jdhuff.h
+- ext/image_intensities/turbojpeg/jdicc.c
+- ext/image_intensities/turbojpeg/jdinput.c
+- ext/image_intensities/turbojpeg/jdmainct.c
+- ext/image_intensities/turbojpeg/jdmainct.h
+- ext/image_intensities/turbojpeg/jdmarker.c
+- ext/image_intensities/turbojpeg/jdmaster.c
+- ext/image_intensities/turbojpeg/jdmaster.h
+- ext/image_intensities/turbojpeg/jdmerge.c
+- ext/image_intensities/turbojpeg/jdmrg565.c
+- ext/image_intensities/turbojpeg/jdmrgext.c
+- ext/image_intensities/turbojpeg/jdphuff.c
+- ext/image_intensities/turbojpeg/jdpostct.c
+- ext/image_intensities/turbojpeg/jdsample.c
+- ext/image_intensities/turbojpeg/jdsample.h
+- ext/image_intensities/turbojpeg/jdtrans.c
+- ext/image_intensities/turbojpeg/jerror.c
+- ext/image_intensities/turbojpeg/jfdctflt.c
+- ext/image_intensities/turbojpeg/jfdctfst.c
+- ext/image_intensities/turbojpeg/jfdctint.c
+- ext/image_intensities/turbojpeg/jidctflt.c
+- ext/image_intensities/turbojpeg/jidctfst.c
+- ext/image_intensities/turbojpeg/jidctint.c
+- ext/image_intensities/turbojpeg/jidctred.c
+- ext/image_intensities/turbojpeg/jinclude.h
+- ext/image_intensities/turbojpeg/jmemmgr.c
+- ext/image_intensities/turbojpeg/jmemnobs.c
+- ext/image_intensities/turbojpeg/jmemsys.h
+- ext/image_intensities/turbojpeg/jpeg_nbits_table.h
+- ext/image_intensities/turbojpeg/jpegcomp.h
+- ext/image_intensities/turbojpeg/jquant1.c
+- ext/image_intensities/turbojpeg/jquant2.c
+- ext/image_intensities/turbojpeg/jsimd.h
+- ext/image_intensities/turbojpeg/jsimd_none.c
+- ext/image_intensities/turbojpeg/jsimddct.h
+- ext/image_intensities/turbojpeg/jstdhuff.c
+- ext/image_intensities/turbojpeg/jutils.c
+- ext/image_intensities/turbojpeg/jversion.h
+- ext/image_intensities/turbojpeg/libturbojpeg.a
+- ext/image_intensities/turbojpeg/rdbmp.c
+- ext/image_intensities/turbojpeg/rdppm.c
+- ext/image_intensities/turbojpeg/tjutil.h
+- ext/image_intensities/turbojpeg/transupp.c
+- ext/image_intensities/turbojpeg/transupp.h
+- ext/image_intensities/turbojpeg/turbojpeg.c
+- ext/image_intensities/turbojpeg/wrbmp.c
+- ext/image_intensities/turbojpeg/wrppm.c
 - image_intensities.gemspec
 - lib/image_intensities.rb
 - lib/image_intensities/native.rb
 - lib/image_intensities/version.rb
 homepage: 
 licenses:
-- MIT
+- BSD
 metadata: {}
 post_install_message: 
 rdoc_options: []