dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

plug-ins: "port" qbist to float (remove the uchar conversion from float code)

This commit is contained in:
Michael Natterer 2018-01-08 21:49:02 +01:00
parent 4c519efefd
commit 29fbeb9e02
1 changed files with 33 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
plug-ins/common/qbist.c
View File

@ -213,13 +213,12 @@ optimize (ExpInfo *info)
static void static void
qbist (ExpInfo *info, qbist (ExpInfo *info,
guchar *buffer, gfloat *buffer,
gint xp, gint xp,
gint yp, gint yp,
gint num, gint num,
gint width, gint width,
gint height, gint height,
gint bpp,
gint oversampling) gint oversampling)
{ {
gint gx; gint gx;
@ -228,11 +227,12 @@ qbist (ExpInfo *info,
for (gx = 0; gx < num; gx++) for (gx = 0; gx < num; gx++)
{ {
gint accum[3], yy, i; gfloat accum[3];
gint yy, i;
for (i = 0; i < 3; i++) for (i = 0; i < 3; i++)
{ {
accum[i] = 0; accum[i] = 0.0;
} }
for (yy = 0; yy < oversampling; yy++) for (yy = 0; yy < oversampling; yy++)
@ -345,27 +345,19 @@ qbist (ExpInfo *info,
break; break;
} }
} }
for (i = 0; i < 3; i++)
{ accum[0] += reg[0][0];
accum[i] += (unsigned char) (reg[0][i] * 255.0 + 0.5); accum[1] += reg[0][1];
} accum[2] += reg[0][2];
} }
} }
for (i = 0; i < bpp; i++) buffer[0] = accum[0] / (gfloat) (oversampling * oversampling);
{ buffer[1] = accum[1] / (gfloat) (oversampling * oversampling);
if (i < 3) buffer[2] = accum[2] / (gfloat) (oversampling * oversampling);
{ buffer[3] = 1.0;
buffer[i] = (guchar) (((gfloat) accum[i] /
(gfloat) (oversampling * oversampling)) + 0.5);
}
else
{
buffer[i] = 255;
}
}
buffer += bpp; buffer += 4;
} }
} }
@ -507,7 +499,7 @@ run (const gchar *name,
iter = gegl_buffer_iterator_new (buffer, iter = gegl_buffer_iterator_new (buffer,
GEGL_RECTANGLE (0, 0, GEGL_RECTANGLE (0, 0,
img_width, img_height), img_width, img_height),
0, babl_format ("RGBA u8"), 0, babl_format ("R'G'B'A float"),
GEGL_ACCESS_READWRITE, GEGL_ACCESS_READWRITE,
GEGL_ABYSS_NONE); GEGL_ABYSS_NONE);
@ -517,7 +509,7 @@ run (const gchar *name,
while (gegl_buffer_iterator_next (iter)) while (gegl_buffer_iterator_next (iter))
{ {
guchar *data = iter->data[0]; gfloat *data = iter->data[0];
GeglRectangle roi = iter->roi[0]; GeglRectangle roi = iter->roi[0];
gint row; gint row;
@ -530,7 +522,6 @@ run (const gchar *name,
roi.width, roi.width,
sel_width, sel_width,
sel_height, sel_height,
4,
qbist_info.oversampling); qbist_info.oversampling);
} }
@ -578,22 +569,33 @@ static void
dialog_update_previews (GtkWidget *widget, dialog_update_previews (GtkWidget *widget,
gpointer data) gpointer data)
{ {
gint i, j; static const Babl *fish = NULL;
guchar buf[PREVIEW_SIZE * PREVIEW_SIZE * 3];
gfloat buf[PREVIEW_SIZE * PREVIEW_SIZE * 4];
guchar u8_buf[PREVIEW_SIZE * PREVIEW_SIZE * 4];
gint i, j;
if (! fish)
fish = babl_fish (babl_format ("R'G'B'A float"),
babl_format ("R'G'B'A u8"));
for (j = 0; j < 9; j++) for (j = 0; j < 9; j++)
{ {
optimize (&info[(j + 5) % 9]); optimize (&info[(j + 5) % 9]);
for (i = 0; i < PREVIEW_SIZE; i++) for (i = 0; i < PREVIEW_SIZE; i++)
{ {
qbist (&info[(j + 5) % 9], buf + i * PREVIEW_SIZE * 3, qbist (&info[(j + 5) % 9], buf + i * PREVIEW_SIZE * 4,
0, i, PREVIEW_SIZE, PREVIEW_SIZE, PREVIEW_SIZE, 3, 1); 0, i, PREVIEW_SIZE, PREVIEW_SIZE, PREVIEW_SIZE, 1);
} }
babl_process (fish, buf, u8_buf, PREVIEW_SIZE * PREVIEW_SIZE);
gimp_preview_area_draw (GIMP_PREVIEW_AREA (preview[j]), gimp_preview_area_draw (GIMP_PREVIEW_AREA (preview[j]),
0, 0, PREVIEW_SIZE, PREVIEW_SIZE, 0, 0, PREVIEW_SIZE, PREVIEW_SIZE,
GIMP_RGB_IMAGE, GIMP_RGBA_IMAGE,
buf, u8_buf,
PREVIEW_SIZE *3); PREVIEW_SIZE * 4);
} }
} }