Request 6329 (accepted)

Overview

Request 6329 (accepted)

Fix build

Created by Aloysius about 1 month ago
In state accepted
Package maintainer: awissu

Submit iscan

Submit package home:Aloysius:branches:Extra / iscan to package Extra / iscan

iscan.changes Changed

iscan.spec Changed

hain01commits2dip-obj.patch Added

@@ -0,0 +1,95 @@
+--- a/backend/dip-obj.c
++++ b/backend/dip-obj.c
+@@ -556,43 +556,72 @@
+ }
+ 
+ /*! \todo Add support for 16 bit color values (#816).
++	Added the commits of https://github.com/hean01/iscan/commit/147edc66ceddb34b5e0c8745a08ce6c96e7e02b5 and https://github.com/hean01/iscan/commit/575468d83bb70d928f5893c4c4b4ce7faa15e3d5 to support 16bit color.
+  */
+ void
+ dip_apply_color_profile (const void *self, const buffer *buf,
+                          const double profile9)
+ {
+   SANE_Int i;
+-  SANE_Byte *r_buf, *g_buf, *b_buf;
+   double red, grn, blu;
+ 
+-  SANE_Byte *data;
+   SANE_Int size;
+ 
+   require (dip == self && buf && profile);
+-  require (8 == buf->ctx.depth);
++  require (buf->ctx.depth == 8 || buf->ctx.depth == 16);
+ 
+   if (SANE_FRAME_RGB != buf->ctx.format)
+     return;
+ 
+-  data = buf->ptr;
+-  size = buf->end - buf->ptr;
++  if (buf->ctx.depth == 8)
++  {
++    SANE_Byte *r_buf, *g_buf, *b_buf;
++    SANE_Byte *data;
+ 
+-  for (i = 0; i < size / 3; i++)
++    data = buf->ptr;
++    size = buf->end - buf->ptr;
++  
++    for (i = 0; i < size / 3; i++)
++    {
++      r_buf = data;
++      g_buf = data + 1;
++      b_buf = data + 2;
++
++      red =
++        profile0 * (*r_buf) + profile1 * (*g_buf) + profile2 * (*b_buf);
++      grn =
++        profile3 * (*r_buf) + profile4 * (*g_buf) + profile5 * (*b_buf);
++      blu =
++        profile6 * (*r_buf) + profile7 * (*g_buf) + profile8 * (*b_buf);
++
++      *data++ = clamp (red, 0, 255);
++      *data++ = clamp (grn, 0, 255);
++      *data++ = clamp (blu, 0, 255);
++    }
++  }
++  else if (buf->ctx.depth == 16)
+   {
+-    r_buf = data;
+-    g_buf = data + 1;
+-    b_buf = data + 2;
+-
+-    red =
+-      profile0 * (*r_buf) + profile1 * (*g_buf) + profile2 * (*b_buf);
+-    grn =
+-      profile3 * (*r_buf) + profile4 * (*g_buf) + profile5 * (*b_buf);
+-    blu =
+-      profile6 * (*r_buf) + profile7 * (*g_buf) + profile8 * (*b_buf);
+-
+-    *data++ = clamp (red, 0, 255);
+-    *data++ = clamp (grn, 0, 255);
+-    *data++ = clamp (blu, 0, 255);
++	uint16_t *r_buf, *g_buf, *b_buf;
++    uint16_t *data;
++	
++    data = (uint16_t *)buf->ptr;
++    while(data < buf->end)
++    {
++      r_buf = data;
++      g_buf = data + 1;
++      b_buf = data + 2;
++
++      red =
++	    profile0 * (*r_buf) + profile1 * (*g_buf) + profile2 * (*b_buf);
++      grn =
++	    profile3 * (*r_buf) + profile4 * (*g_buf) + profile5 * (*b_buf);
++      blu =
++	    profile6 * (*r_buf) + profile7 * (*g_buf) + profile8 * (*b_buf);
++
++      *data++ = clamp (red, 0, 65535);
++      *data++ = clamp (grn, 0, 65535);
++      *data++ = clamp (blu, 0, 65535);
++    }
+   }
+ }
+

iscan-2.30.4.2-c99.patch Added

Build Results
RPM Lint

Refresh

Comments for request 6329 0

Request History

Aloysius created request about 1 month ago

Fix build

olh accepted request 20 days ago