Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1587)

Unified Diff: third_party/qcms/src/tests/qcms_test_internal_srgb.c

Issue 1779163002: [qcms] Update primaries used to build internal sRGB profile (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase 2 Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« third_party/qcms/src/iccread.c ('K') | « third_party/qcms/src/iccread.c ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/qcms/src/tests/qcms_test_internal_srgb.c
diff --git a/third_party/qcms/src/tests/qcms_test_internal_srgb.c b/third_party/qcms/src/tests/qcms_test_internal_srgb.c
index 58855a1b6c924edcc0c4a50a1f42afdbf5f5d731..9ab20214400b8fc3729d4507b6d54f88dffa5094 100644
--- a/third_party/qcms/src/tests/qcms_test_internal_srgb.c
+++ b/third_party/qcms/src/tests/qcms_test_internal_srgb.c
@@ -9,54 +9,73 @@
#include <stdint.h>
#include <stdlib.h>
-// Colorant matrix for the official sRGB IEC61966-2.1 color (D50) primaries.
+// D50 adapted color primaries of the sRGB IEC61966-2.1 color profile.
static s15Fixed16Number sRGB_reference[3][3] = {
- {0x06fa2 /*0.436066*/, /*0.385147*/ 0x06299, /*0.143066*/ 0x024a0},
- {0x038f5 /*0.222488*/, /*0.716873*/ 0x0b785, /*0.060608*/ 0x00f84},
- {0x00390 /*0.013916*/, /*0.097076*/ 0x018da, /*0.714096*/ 0x0b6cf}};
+ {0x06fa2 /*0.436066*/, /*0.385147*/ 0x06299, /*0.143066*/ 0x024a0},
+ {0x038f5 /*0.222488*/, /*0.716873*/ 0x0b785, /*0.060608*/ 0x00f84},
+ {0x00390 /*0.013916*/, /*0.097076*/ 0x018da, /*0.714096*/ 0x0b6cf}
+};
+
+// Reference media white point of the sRGB IEC61966-2.1 color profile.
+static struct XYZNumber D65 = {
+ 0xf351, 0x10000, 0x116cc // ( 0.950455, 1.000000, 1.089050 )
+};
static int qcms_test_internal_srgb(size_t width,
- size_t height,
- int iterations,
- const char *in_path,
- const char *out_path,
- const int force_software)
+ size_t height,
+ int iterations,
+ const char *in_path,
+ const char *out_path,
+ const int force_software)
{
- qcms_profile *profile = qcms_profile_sRGB();
- s15Fixed16Number sRGB_internal[3][3];
- s15Fixed16Number diff = 0;
- int i, j;
-
- printf("Test qcms internal sRGB colorant matrix against official sRGB IEC61966-2.1 color (D50) primaries\n");
-
- sRGB_internal[0][0] = profile->redColorant.X;
- sRGB_internal[1][0] = profile->redColorant.Y;
- sRGB_internal[2][0] = profile->redColorant.Z;
- sRGB_internal[0][1] = profile->greenColorant.X;
- sRGB_internal[1][1] = profile->greenColorant.Y;
- sRGB_internal[2][1] = profile->greenColorant.Z;
- sRGB_internal[0][2] = profile->blueColorant.X;
- sRGB_internal[1][2] = profile->blueColorant.Y;
- sRGB_internal[2][2] = profile->blueColorant.Z;
-
- for (i = 0; i < 3; i++) {
- for (j = 0; j < 3; j++) {
- s15Fixed16Number tmp = sRGB_internal[i][j] - sRGB_reference[i][j];
- printf("\t%d", tmp);
- diff += abs(tmp);
- }
- printf("\n");
- }
-
- qcms_profile_release(profile);
-
- printf("Total error = 0x%x [%.6f]\n", diff, diff / 65536.0);
-
- return diff;
+ qcms_profile *profile = qcms_profile_sRGB();
+ s15Fixed16Number sRGB_internal[3][3];
+ s15Fixed16Number diff = 0;
+ int i, j;
+
+ if (qcms_profile_is_bogus(profile)) {
+ fprintf(stderr, "Failure: the internal sRGB profile failed the bogus profile check\n");
+ qcms_profile_release(profile);
+ return -1;
+ }
+
+ printf("Test qcms internal sRGB color primaries against sRGB IEC61966-2.1 color primaries\n");
+
+ sRGB_internal[0][0] = profile->redColorant.X;
+ sRGB_internal[1][0] = profile->redColorant.Y;
+ sRGB_internal[2][0] = profile->redColorant.Z;
+ sRGB_internal[0][1] = profile->greenColorant.X;
+ sRGB_internal[1][1] = profile->greenColorant.Y;
+ sRGB_internal[2][1] = profile->greenColorant.Z;
+ sRGB_internal[0][2] = profile->blueColorant.X;
+ sRGB_internal[1][2] = profile->blueColorant.Y;
+ sRGB_internal[2][2] = profile->blueColorant.Z;
+
+ for (i = 0; i < 3; i++) {
+ for (j = 0; j < 3; j++) {
+ s15Fixed16Number tmp = sRGB_internal[i][j] - sRGB_reference[i][j];
+ printf("\t%d", tmp);
+ diff += abs(tmp);
+ }
+ printf("\n");
+ }
+
+ printf("Total error = 0x%x [%.6f]\n\n", diff, diff / 65536.0);
+
+ printf("Test media white point against expected sRGB IEC61966-2.1 D65 XYZ values\n");
+ printf("Internal values = [0x%X, 0x%X, 0x%X]\n",
+ profile->mediaWhitePoint.X, profile->mediaWhitePoint.Y, profile->mediaWhitePoint.Z);
+
+ printf("White point error = [%d, %d, %d]\n",
+ profile->mediaWhitePoint.X - D65.X, profile->mediaWhitePoint.Y - D65.Y, profile->mediaWhitePoint.Z - D65.Z);
+
+ qcms_profile_release(profile);
+
+ return diff;
}
struct qcms_test_case qcms_test_internal_srgb_info = {
- "qcms_test_internal_srgb",
- qcms_test_internal_srgb,
- QCMS_TEST_DISABLED
+ "qcms_test_internal_srgb",
+ qcms_test_internal_srgb,
+ QCMS_TEST_DISABLED
};
« third_party/qcms/src/iccread.c ('K') | « third_party/qcms/src/iccread.c ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698