Roll skia/third_party/skcms e51ca8b81987..0e5f77218153 (1 commits)
https://skia.googlesource.com/skcms.git/+log/e51ca8b81987..0e5f77218153
git log e51ca8b81987..0e5f77218153 --date=short --no-merges --format='%ad %ae %s'
2019-11-11 brianosman@google.com Move ICCTag struct and GetTag functions to skcms_internal.h
Created with:
gclient setdep -r skia/third_party/skcms@0e5f77218153
If this roll has caused a breakage, revert this CL and stop the roller
using the controls here:
https://autoroll.skia.org/r/skcms-skia-autoroll
Please CC halcanary@google.com,mtklein@google.com on the revert to ensure that a human
is aware of the problem.
To report a problem with the AutoRoller itself, please file a bug:
https://bugs.chromium.org/p/skia/issues/entry?template=Autoroller+Bug
Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+/master/autoroll/README.md
CQ_INCLUDE_TRYBOTS=luci.chromium.try:linux-blink-rel
Bug: None
Change-Id: If85f40fa8110589cc76890bb477ac53375d21b75
TBR=halcanary@google.com,mtklein@google.com
TBR=halcanary@google.com,mtklein@google.com
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/253908
Reviewed-by: skia-autoroll <skia-autoroll@skia-public.iam.gserviceaccount.com>
Commit-Queue: skia-autoroll <skia-autoroll@skia-public.iam.gserviceaccount.com>
diff --git a/include/third_party/skcms/skcms.h b/include/third_party/skcms/skcms.h
index 789f975..3df6b44 100644
--- a/include/third_party/skcms/skcms.h
+++ b/include/third_party/skcms/skcms.h
@@ -176,16 +176,6 @@
skcms_TransferFunction* approx,
float* max_error);
-typedef struct skcms_ICCTag {
- uint32_t signature;
- uint32_t type;
- uint32_t size;
- const uint8_t* buf;
-} skcms_ICCTag;
-
-SKCMS_API void skcms_GetTagByIndex (const skcms_ICCProfile*, uint32_t idx, skcms_ICCTag*);
-SKCMS_API bool skcms_GetTagBySignature(const skcms_ICCProfile*, uint32_t sig, skcms_ICCTag*);
-
SKCMS_API bool skcms_GetCHAD(const skcms_ICCProfile*, skcms_Matrix3x3*);
SKCMS_API bool skcms_GetWTPT(const skcms_ICCProfile*, float xyz[3]);
diff --git a/third_party/skcms/skcms_internal.h b/third_party/skcms/skcms_internal.h
index 3a82ec7..0eaa9dd 100644
--- a/third_party/skcms/skcms_internal.h
+++ b/third_party/skcms/skcms_internal.h
@@ -21,6 +21,16 @@
// ~~~~ General Helper Macros ~~~~
#define ARRAY_COUNT(arr) (int)(sizeof((arr)) / sizeof(*(arr)))
+ typedef struct skcms_ICCTag {
+ uint32_t signature;
+ uint32_t type;
+ uint32_t size;
+ const uint8_t* buf;
+ } skcms_ICCTag;
+
+ void skcms_GetTagByIndex (const skcms_ICCProfile*, uint32_t idx, skcms_ICCTag*);
+ bool skcms_GetTagBySignature(const skcms_ICCProfile*, uint32_t sig, skcms_ICCTag*);
+
// 252 of a random shuffle of all possible bytes.
// 252 is evenly divisible by 3 and 4. Only 192, 10, 241, and 43 are missing.
// Used for ICC profile equivalence testing.
diff --git a/third_party/skcms/version.sha1 b/third_party/skcms/version.sha1
index 316cfbd..e8442be 100755
--- a/third_party/skcms/version.sha1
+++ b/third_party/skcms/version.sha1
@@ -1 +1 @@
-e51ca8b819875c4d3ce30118db013cc707dd30e0
\ No newline at end of file
+0e5f7721815369bed34c27a222dbc218d0487ccf
\ No newline at end of file
