Add BGRA output format support to qcms

third_party/qcms/src/transform.c

 /* vim: set ts=8 sw=8 noexpandtab: */
 //  qcms
 //  Copyright (C) 2009 Mozilla Corporation
 //  Copyright (C) 1998-2007 Marti Maria
 //
 // Permission is hereby granted, free of charge, to any person obtaining 
 // a copy of this software and associated documentation files (the "Software"), 
 // to deal in the Software without restriction, including without limitation 
 // the rights to use, copy, modify, merge, publish, distribute, sublicense, 
 // and/or sell copies of the Software, and to permit persons to whom the Software 
@@ skipping 163 matching lines @@
         // Normalize
         return matrix_multiply(chad_inv, matrix_multiply(cone, chad));
 }
 
 /* from lcms: cmsAdaptionMatrix */
 // Returns the final chrmatic adaptation from illuminant FromIll to Illuminant ToIll
 // Bradford is assumed
 static struct matrix
 adaption_matrix(struct CIE_XYZ source_illumination, struct CIE_XYZ target_illumination)
 {
+#if defined (_MSC_VER)
+#pragma warning(push)
+/* Disable double to float truncation warning 4305 */
+#pragma warning(disable:4305)
+#endif
         struct matrix lam_rigg = {{ // Bradford matrix
                                  {  0.8951,  0.2664, -0.1614 },
                                  { -0.7502,  1.7135,  0.0367 },
                                  {  0.0389, -0.0685,  1.0296 }
                                  }};
+#if defined (_MSC_VER)
+/* Restore warnings */
+#pragma warning(pop)
+#endif
         return compute_chromatic_adaption(source_illumination, target_illumination, lam_rigg);
 }
 
 /* from lcms: cmsAdaptMatrixToD50 */
 static struct matrix adapt_matrix_to_D50(struct matrix r, qcms_CIE_xyY source_white_pt)
 {
         struct CIE_XYZ Dn;
         struct matrix Bradford;
 
         if (source_white_pt.y == 0.0)
@@ skipping 24 matching lines @@
         profile->greenColorant.Z = double_to_s15Fixed16Number(colorants.m[2][1]);
 
         profile->blueColorant.X = double_to_s15Fixed16Number(colorants.m[0][2]);
         profile->blueColorant.Y = double_to_s15Fixed16Number(colorants.m[1][2]);
         profile->blueColorant.Z = double_to_s15Fixed16Number(colorants.m[2][2]);
 
         return true;
 }
 
 #if 0
-static void qcms_transform_data_rgb_out_pow(qcms_transform *transform, unsigned char *src, unsigned char *dest, size_t length)
+static void qcms_transform_data_rgb_out_pow(qcms_transform *transform, unsigned char *src, unsigned char *dest, size_t length, qcms_format_type output_format)
 {
+        const int r_out = output_format.r;
+        const int b_out = output_format.b;
+
         int i;
         float (*mat)[4] = transform->matrix;
         for (i=0; i<length; i++) {
                 unsigned char device_r = *src++;
                 unsigned char device_g = *src++;
                 unsigned char device_b = *src++;
 
                 float linear_r = transform->input_gamma_table_r[device_r];
                 float linear_g = transform->input_gamma_table_g[device_g];
                 float linear_b = transform->input_gamma_table_b[device_b];
 
                 float out_linear_r = mat[0][0]*linear_r + mat[1][0]*linear_g + mat[2][0]*linear_b;
                 float out_linear_g = mat[0][1]*linear_r + mat[1][1]*linear_g + mat[2][1]*linear_b;
                 float out_linear_b = mat[0][2]*linear_r + mat[1][2]*linear_g + mat[2][2]*linear_b;
 
                 float out_device_r = pow(out_linear_r, transform->out_gamma_r);
                 float out_device_g = pow(out_linear_g, transform->out_gamma_g);
                 float out_device_b = pow(out_linear_b, transform->out_gamma_b);
 
-                *dest++ = clamp_u8(255*out_device_r);
-                *dest++ = clamp_u8(255*out_device_g);
-                *dest++ = clamp_u8(255*out_device_b);
+                dest[r_out] = clamp_u8(out_device_r*255);
+                dest[1]     = clamp_u8(out_device_g*255);
+                dest[b_out] = clamp_u8(out_device_b*255);
+                dest += 3;
         }
 }
 #endif
 
-static void qcms_transform_data_gray_out_lut(qcms_transform *transform, unsigned char *src, unsigned char *dest, size_t length)
+static void qcms_transform_data_gray_out_lut(qcms_transform *transform, unsigned char *src, unsigned char *dest, size_t length, qcms_format_type output_format)
 {
+        const int r_out = output_format.r;
+        const int b_out = output_format.b;
+
         unsigned int i;
         for (i = 0; i < length; i++) {
                 float out_device_r, out_device_g, out_device_b;
                 unsigned char device = *src++;
 
                 float linear = transform->input_gamma_table_gray[device];
 
-                out_device_r = lut_interp_linear(linear, transform->output_gamma_lut_r, transform->output_gamma_lut_r_length);
+                out_device_r = lut_interp_linear(linear, transform->output_gamma_lut_r, transform->output_gamma_lut_r_length);
                 out_device_g = lut_interp_linear(linear, transform->output_gamma_lut_g, transform->output_gamma_lut_g_length);
                 out_device_b = lut_interp_linear(linear, transform->output_gamma_lut_b, transform->output_gamma_lut_b_length);
 
-                *dest++ = clamp_u8(out_device_r*255);
-                *dest++ = clamp_u8(out_device_g*255);
-                *dest++ = clamp_u8(out_device_b*255);
+                dest[r_out] = clamp_u8(out_device_r*255);
+                dest[1]     = clamp_u8(out_device_g*255);
+                dest[b_out] = clamp_u8(out_device_b*255);
+                dest += 3;
         }
 }
 
 /* Alpha is not corrected.
    A rationale for this is found in Alvy Ray's "Should Alpha Be Nonlinear If
    RGB Is?" Tech Memo 17 (December 14, 1998).
         See: ftp://ftp.alvyray.com/Acrobat/17_Nonln.pdf
 */
 
-static void qcms_transform_data_graya_out_lut(qcms_transform *transform, unsigned char *src, unsigned char *dest, size_t length)
+static void qcms_transform_data_graya_out_lut(qcms_transform *transform, unsigned char *src, unsigned char *dest, size_t length, qcms_format_type output_format)
 {
+        const int r_out = output_format.r;
+        const int b_out = output_format.b;
+
         unsigned int i;
         for (i = 0; i < length; i++) {
                 float out_device_r, out_device_g, out_device_b;
                 unsigned char device = *src++;
                 unsigned char alpha = *src++;
 
                 float linear = transform->input_gamma_table_gray[device];
 
-                out_device_r = lut_interp_linear(linear, transform->output_gamma_lut_r, transform->output_gamma_lut_r_length);
+                out_device_r = lut_interp_linear(linear, transform->output_gamma_lut_r, transform->output_gamma_lut_r_length);
                 out_device_g = lut_interp_linear(linear, transform->output_gamma_lut_g, transform->output_gamma_lut_g_length);
                 out_device_b = lut_interp_linear(linear, transform->output_gamma_lut_b, transform->output_gamma_lut_b_length);
 
-                *dest++ = clamp_u8(out_device_r*255);
-                *dest++ = clamp_u8(out_device_g*255);
-                *dest++ = clamp_u8(out_device_b*255);
-                *dest++ = alpha;
+                dest[r_out] = clamp_u8(out_device_r*255);
+                dest[1]     = clamp_u8(out_device_g*255);
+                dest[b_out] = clamp_u8(out_device_b*255);
+                dest[3]     = alpha;
+                dest += 4;
         }
 }
 
 
-static void qcms_transform_data_gray_out_precache(qcms_transform *transform, unsigned char *src, unsigned char *dest, size_t length)
+static void qcms_transform_data_gray_out_precache(qcms_transform *transform, unsigned char *src, unsigned char *dest, size_t length, qcms_format_type output_format)
 {
+        const int r_out = output_format.r;
+        const int b_out = output_format.b;
+
         unsigned int i;
         for (i = 0; i < length; i++) {
                 unsigned char device = *src++;
                 uint16_t gray;
 
                 float linear = transform->input_gamma_table_gray[device];
 
                 /* we could round here... */
                 gray = linear * PRECACHE_OUTPUT_MAX;
 
-                *dest++ = transform->output_table_r->data[gray];
-                *dest++ = transform->output_table_g->data[gray];
-                *dest++ = transform->output_table_b->data[gray];
+                dest[r_out] = transform->output_table_r->data[gray];
+                dest[1]     = transform->output_table_g->data[gray];
+                dest[b_out] = transform->output_table_b->data[gray];
+                dest += 3;
         }
 }
 
-static void qcms_transform_data_graya_out_precache(qcms_transform *transform, unsigned char *src, unsigned char *dest, size_t length)
+
+static void qcms_transform_data_graya_out_precache(qcms_transform *transform, unsigned char *src, unsigned char *dest, size_t length, qcms_format_type output_format)
 {
+        const int r_out = output_format.r;
+        const int b_out = output_format.b;
+
         unsigned int i;
         for (i = 0; i < length; i++) {
                 unsigned char device = *src++;
                 unsigned char alpha = *src++;
                 uint16_t gray;
 
                 float linear = transform->input_gamma_table_gray[device];
 
                 /* we could round here... */
                 gray = linear * PRECACHE_OUTPUT_MAX;
 
-                *dest++ = transform->output_table_r->data[gray];
-                *dest++ = transform->output_table_g->data[gray];
-                *dest++ = transform->output_table_b->data[gray];
-                *dest++ = alpha;
+                dest[r_out] = transform->output_table_r->data[gray];
+                dest[1]     = transform->output_table_g->data[gray];
+                dest[b_out] = transform->output_table_b->data[gray];
+                dest[3]     = alpha;
+                dest += 4;
         }
 }
 
-static void qcms_transform_data_rgb_out_lut_precache(qcms_transform *transform, unsigned char *src, unsigned char *dest, size_t length)
+static void qcms_transform_data_rgb_out_lut_precache(qcms_transform *transform, unsigned char *src, unsigned char *dest, size_t length, qcms_format_type output_format)
 {
+        const int r_out = output_format.r;
+        const int b_out = output_format.b;
+
         unsigned int i;
         float (*mat)[4] = transform->matrix;
         for (i = 0; i < length; i++) {
                 unsigned char device_r = *src++;
                 unsigned char device_g = *src++;
                 unsigned char device_b = *src++;
                 uint16_t r, g, b;
 
                 float linear_r = transform->input_gamma_table_r[device_r];
                 float linear_g = transform->input_gamma_table_g[device_g];
                 float linear_b = transform->input_gamma_table_b[device_b];
 
                 float out_linear_r = mat[0][0]*linear_r + mat[1][0]*linear_g + mat[2][0]*linear_b;
                 float out_linear_g = mat[0][1]*linear_r + mat[1][1]*linear_g + mat[2][1]*linear_b;
                 float out_linear_b = mat[0][2]*linear_r + mat[1][2]*linear_g + mat[2][2]*linear_b;
 
                 out_linear_r = clamp_float(out_linear_r);
                 out_linear_g = clamp_float(out_linear_g);
                 out_linear_b = clamp_float(out_linear_b);
 
                 /* we could round here... */
                 r = out_linear_r * PRECACHE_OUTPUT_MAX;
                 g = out_linear_g * PRECACHE_OUTPUT_MAX;
                 b = out_linear_b * PRECACHE_OUTPUT_MAX;
 
-                *dest++ = transform->output_table_r->data[r];
-                *dest++ = transform->output_table_g->data[g];
-                *dest++ = transform->output_table_b->data[b];
+                dest[r_out] = transform->output_table_r->data[r];
+                dest[1]     = transform->output_table_g->data[g];
+                dest[b_out] = transform->output_table_b->data[b];
+                dest += 3;
         }
 }
 
-static void qcms_transform_data_rgba_out_lut_precache(qcms_transform *transform, unsigned char *src, unsigned char *dest, size_t length)
+static void qcms_transform_data_rgba_out_lut_precache(qcms_transform *transform, unsigned char *src, unsigned char *dest, size_t length, qcms_format_type output_format)
 {
+        const int r_out = output_format.r;
+        const int b_out = output_format.b;
+
         unsigned int i;
         float (*mat)[4] = transform->matrix;
         for (i = 0; i < length; i++) {
                 unsigned char device_r = *src++;
                 unsigned char device_g = *src++;
                 unsigned char device_b = *src++;
                 unsigned char alpha = *src++;
                 uint16_t r, g, b;
 
                 float linear_r = transform->input_gamma_table_r[device_r];
                 float linear_g = transform->input_gamma_table_g[device_g];
                 float linear_b = transform->input_gamma_table_b[device_b];
 
                 float out_linear_r = mat[0][0]*linear_r + mat[1][0]*linear_g + mat[2][0]*linear_b;
                 float out_linear_g = mat[0][1]*linear_r + mat[1][1]*linear_g + mat[2][1]*linear_b;
                 float out_linear_b = mat[0][2]*linear_r + mat[1][2]*linear_g + mat[2][2]*linear_b;
 
                 out_linear_r = clamp_float(out_linear_r);
                 out_linear_g = clamp_float(out_linear_g);
                 out_linear_b = clamp_float(out_linear_b);
 
                 /* we could round here... */
                 r = out_linear_r * PRECACHE_OUTPUT_MAX;
                 g = out_linear_g * PRECACHE_OUTPUT_MAX;
                 b = out_linear_b * PRECACHE_OUTPUT_MAX;
 
-                *dest++ = transform->output_table_r->data[r];
-                *dest++ = transform->output_table_g->data[g];
-                *dest++ = transform->output_table_b->data[b];
-                *dest++ = alpha;
+                dest[r_out] = transform->output_table_r->data[r];
+                dest[1]     = transform->output_table_g->data[g];
+                dest[b_out] = transform->output_table_b->data[b];
+                dest[3]     = alpha;
+                dest += 4;
         }
 }
 
 // Not used
 /* 
-static void qcms_transform_data_clut(qcms_transform *transform, unsigned char *src, unsigned char *dest, size_t length) {
+static void qcms_transform_data_clut(qcms_transform *transform, unsigned char *src, unsigned char *dest, size_t length, qcms_format_type output_format)
+{
+        const int r_out = output_format.r;
+        const int b_out = output_format.b;
+
         unsigned int i;
         int xy_len = 1;
         int x_len = transform->grid_size;
         int len = x_len * x_len;
         float* r_table = transform->r_clut;
         float* g_table = transform->g_clut;
         float* b_table = transform->b_clut;
   
         for (i = 0; i < length; i++) {
                 unsigned char in_r = *src++;
@@ skipping 28 matching lines @@
                 float clut_g = lerp(g_y1, g_y2, z_d);
 
                 float b_x1 = lerp(CLU(b_table,x,y,z), CLU(b_table,x_n,y,z), x_d);
                 float b_x2 = lerp(CLU(b_table,x,y_n,z), CLU(b_table,x_n,y_n,z), x_d);
                 float b_y1 = lerp(b_x1, b_x2, y_d);
                 float b_x3 = lerp(CLU(b_table,x,y,z_n), CLU(b_table,x_n,y,z_n), x_d);
                 float b_x4 = lerp(CLU(b_table,x,y_n,z_n), CLU(b_table,x_n,y_n,z_n), x_d);
                 float b_y2 = lerp(b_x3, b_x4, y_d);
                 float clut_b = lerp(b_y1, b_y2, z_d);
 
-                *dest++ = clamp_u8(clut_r*255.0f);
-                *dest++ = clamp_u8(clut_g*255.0f);
-                *dest++ = clamp_u8(clut_b*255.0f);
-        }       
+                dest[r_out] = clamp_u8(clut_r*255.0f);
+                dest[1]     = clamp_u8(clut_g*255.0f);
+                dest[b_out] = clamp_u8(clut_b*255.0f);
+                dest += 3;
+        }
 }
 */
 
 // Using lcms' tetra interpolation algorithm.
-static void qcms_transform_data_tetra_clut_rgba(qcms_transform *transform, unsigned char *src, unsigned char *dest, size_t length) {
+static void qcms_transform_data_tetra_clut_rgba(qcms_transform *transform, unsigned char *src, unsigned char *dest, size_t length, qcms_format_type output_format)
+{
+        const int r_out = output_format.r;
+        const int b_out = output_format.b;
+
         unsigned int i;
         int xy_len = 1;
         int x_len = transform->grid_size;
         int len = x_len * x_len;
         float* r_table = transform->r_clut;
         float* g_table = transform->g_clut;
         float* b_table = transform->b_clut;
         float c0_r, c1_r, c2_r, c3_r;
         float c0_g, c1_g, c2_g, c3_g;
         float c0_b, c1_b, c2_b, c3_b;
@@ skipping 86 matching lines @@
                                         c2_b = CLU(b_table, x, y_n, z_n) - CLU(b_table, x, y, z_n);
                                         c3_b = CLU(b_table, x, y, z_n) - c0_b;
                                 }
                         }
                 }
                                 
                 clut_r = c0_r + c1_r*rx + c2_r*ry + c3_r*rz;
                 clut_g = c0_g + c1_g*rx + c2_g*ry + c3_g*rz;
                 clut_b = c0_b + c1_b*rx + c2_b*ry + c3_b*rz;
 
-                *dest++ = clamp_u8(clut_r*255.0f);
-                *dest++ = clamp_u8(clut_g*255.0f);
-                *dest++ = clamp_u8(clut_b*255.0f);
-                *dest++ = in_a;
-        }       
+                dest[r_out] = clamp_u8(clut_r*255.0f);
+                dest[1]     = clamp_u8(clut_g*255.0f);
+                dest[b_out] = clamp_u8(clut_b*255.0f);
+                dest[3]     = in_a;
+                dest += 4;
+        }
 }
 
 // Using lcms' tetra interpolation code.
-static void qcms_transform_data_tetra_clut(qcms_transform *transform, unsigned char *src, unsigned char *dest, size_t length) {
+static void qcms_transform_data_tetra_clut(qcms_transform *transform, unsigned char *src, unsigned char *dest, size_t length, qcms_format_type output_format)
+{
+        const int r_out = output_format.r;
+        const int b_out = output_format.b;
+
         unsigned int i;
         int xy_len = 1;
         int x_len = transform->grid_size;
         int len = x_len * x_len;
         float* r_table = transform->r_clut;
         float* g_table = transform->g_clut;
         float* b_table = transform->b_clut;
         float c0_r, c1_r, c2_r, c3_r;
         float c0_g, c1_g, c2_g, c3_g;
         float c0_b, c1_b, c2_b, c3_b;
@@ skipping 85 matching lines @@
                                         c2_b = CLU(b_table, x, y_n, z_n) - CLU(b_table, x, y, z_n);
                                         c3_b = CLU(b_table, x, y, z_n) - c0_b;
                                 }
                         }
                 }
                                 
                 clut_r = c0_r + c1_r*rx + c2_r*ry + c3_r*rz;
                 clut_g = c0_g + c1_g*rx + c2_g*ry + c3_g*rz;
                 clut_b = c0_b + c1_b*rx + c2_b*ry + c3_b*rz;
 
-                *dest++ = clamp_u8(clut_r*255.0f);
-                *dest++ = clamp_u8(clut_g*255.0f);
-                *dest++ = clamp_u8(clut_b*255.0f);
-        }       
+                dest[r_out] = clamp_u8(clut_r*255.0f);
+                dest[1]     = clamp_u8(clut_g*255.0f);
+                dest[b_out] = clamp_u8(clut_b*255.0f);
+                dest += 3;
+        }
 }
 
-static void qcms_transform_data_rgb_out_lut(qcms_transform *transform, unsigned char *src, unsigned char *dest, size_t length)
+static void qcms_transform_data_rgb_out_lut(qcms_transform *transform, unsigned char *src, unsigned char *dest, size_t length, qcms_format_type output_format)
 {
+        const int r_out = output_format.r;
+        const int b_out = output_format.b;
+
         unsigned int i;
         float (*mat)[4] = transform->matrix;
         for (i = 0; i < length; i++) {
                 unsigned char device_r = *src++;
                 unsigned char device_g = *src++;
                 unsigned char device_b = *src++;
                 float out_device_r, out_device_g, out_device_b;
 
                 float linear_r = transform->input_gamma_table_r[device_r];
                 float linear_g = transform->input_gamma_table_g[device_g];
                 float linear_b = transform->input_gamma_table_b[device_b];
 
                 float out_linear_r = mat[0][0]*linear_r + mat[1][0]*linear_g + mat[2][0]*linear_b;
                 float out_linear_g = mat[0][1]*linear_r + mat[1][1]*linear_g + mat[2][1]*linear_b;
                 float out_linear_b = mat[0][2]*linear_r + mat[1][2]*linear_g + mat[2][2]*linear_b;
 
                 out_linear_r = clamp_float(out_linear_r);
                 out_linear_g = clamp_float(out_linear_g);
                 out_linear_b = clamp_float(out_linear_b);
 
                 out_device_r = lut_interp_linear(out_linear_r, 
                                 transform->output_gamma_lut_r, transform->output_gamma_lut_r_length);
                 out_device_g = lut_interp_linear(out_linear_g, 
                                 transform->output_gamma_lut_g, transform->output_gamma_lut_g_length);
                 out_device_b = lut_interp_linear(out_linear_b, 
                                 transform->output_gamma_lut_b, transform->output_gamma_lut_b_length);
 
-                *dest++ = clamp_u8(out_device_r*255);
-                *dest++ = clamp_u8(out_device_g*255);
-                *dest++ = clamp_u8(out_device_b*255);
+                dest[r_out] = clamp_u8(out_device_r*255);
+                dest[1]     = clamp_u8(out_device_g*255);
+                dest[b_out] = clamp_u8(out_device_b*255);
+                dest += 3;
         }
 }
 
-static void qcms_transform_data_rgba_out_lut(qcms_transform *transform, unsigned char *src, unsigned char *dest, size_t length)
+static void qcms_transform_data_rgba_out_lut(qcms_transform *transform, unsigned char *src, unsigned char *dest, size_t length, qcms_format_type output_format)
 {
+        const int r_out = output_format.r;
+        const int b_out = output_format.b;
+
         unsigned int i;
         float (*mat)[4] = transform->matrix;
         for (i = 0; i < length; i++) {
                 unsigned char device_r = *src++;
                 unsigned char device_g = *src++;
                 unsigned char device_b = *src++;
                 unsigned char alpha = *src++;
                 float out_device_r, out_device_g, out_device_b;
 
                 float linear_r = transform->input_gamma_table_r[device_r];
                 float linear_g = transform->input_gamma_table_g[device_g];
                 float linear_b = transform->input_gamma_table_b[device_b];
 
                 float out_linear_r = mat[0][0]*linear_r + mat[1][0]*linear_g + mat[2][0]*linear_b;
                 float out_linear_g = mat[0][1]*linear_r + mat[1][1]*linear_g + mat[2][1]*linear_b;
                 float out_linear_b = mat[0][2]*linear_r + mat[1][2]*linear_g + mat[2][2]*linear_b;
 
                 out_linear_r = clamp_float(out_linear_r);
                 out_linear_g = clamp_float(out_linear_g);
                 out_linear_b = clamp_float(out_linear_b);
 
                 out_device_r = lut_interp_linear(out_linear_r, 
                                 transform->output_gamma_lut_r, transform->output_gamma_lut_r_length);
                 out_device_g = lut_interp_linear(out_linear_g, 
                                 transform->output_gamma_lut_g, transform->output_gamma_lut_g_length);
                 out_device_b = lut_interp_linear(out_linear_b, 
                                 transform->output_gamma_lut_b, transform->output_gamma_lut_b_length);
 
-                *dest++ = clamp_u8(out_device_r*255);
-                *dest++ = clamp_u8(out_device_g*255);
-                *dest++ = clamp_u8(out_device_b*255);
-                *dest++ = alpha;
+                dest[r_out] = clamp_u8(out_device_r*255);
+                dest[1]     = clamp_u8(out_device_g*255);
+                dest[b_out] = clamp_u8(out_device_b*255);
+                dest[3]     = alpha;
+                dest += 4;
         }
 }
 
 #if 0
-static void qcms_transform_data_rgb_out_linear(qcms_transform *transform, unsigned char *src, unsigned char *dest, size_t length)
+static void qcms_transform_data_rgb_out_linear(qcms_transform *transform, unsigned char *src, unsigned char *dest, size_t length, qcms_format_type output_format)
 {
+        const int r_out = output_format.r;
+        const int b_out = output_format.b;
+
         int i;
         float (*mat)[4] = transform->matrix;
         for (i = 0; i < length; i++) {
                 unsigned char device_r = *src++;
                 unsigned char device_g = *src++;
                 unsigned char device_b = *src++;
 
                 float linear_r = transform->input_gamma_table_r[device_r];
                 float linear_g = transform->input_gamma_table_g[device_g];
                 float linear_b = transform->input_gamma_table_b[device_b];
 
                 float out_linear_r = mat[0][0]*linear_r + mat[1][0]*linear_g + mat[2][0]*linear_b;
                 float out_linear_g = mat[0][1]*linear_r + mat[1][1]*linear_g + mat[2][1]*linear_b;
                 float out_linear_b = mat[0][2]*linear_r + mat[1][2]*linear_g + mat[2][2]*linear_b;
 
-                *dest++ = clamp_u8(out_linear_r*255);
-                *dest++ = clamp_u8(out_linear_g*255);
-                *dest++ = clamp_u8(out_linear_b*255);
+                dest[r_out] = clamp_u8(out_linear_r*255);
+                dest[1]     = clamp_u8(out_linear_g*255);
+                dest[b_out] = clamp_u8(out_linear_b*255);
+                dest += 3;
         }
 }
 #endif
 
 static struct precache_output *precache_reference(struct precache_output *p)
 {
         p->ref_count++;
         return p;
 }
 
@@ skipping 452 matching lines @@
         }
         return transform;
 }
 
 #if defined(__GNUC__) && !defined(__x86_64__) && !defined(__amd64__)
 /* we need this to avoid crashes when gcc assumes the stack is 128bit aligned */
 __attribute__((__force_align_arg_pointer__))
 #endif
 void qcms_transform_data(qcms_transform *transform, void *src, void *dest, size_t length)
 {
-        transform->transform_fn(transform, src, dest, length);
+        static const struct _qcms_format_type output_rgbx = { 0, 2 };
+
+        transform->transform_fn(transform, src, dest, length, output_rgbx);
+}
+
+void qcms_transform_data_type(qcms_transform *transform, void *src, void *dest, size_t length, qcms_output_type type)
+{
+        static const struct _qcms_format_type output_rgbx = { 0, 2 };
+        static const struct _qcms_format_type output_bgrx = { 2, 0 };
+
+        transform->transform_fn(transform, src, dest, length, type == QCMS_OUTPUT_BGRX ? output_bgrx : output_rgbx);
 }
 
 qcms_bool qcms_supports_iccv4;
 void qcms_enable_iccv4()
 {
         qcms_supports_iccv4 = true;
 }