Roll skia/third_party/skcms a893aa3..2c9b55f (1 commits)

https://skia.googlesource.com/skcms.git/+log/a893aa3..2c9b55f

2018-04-25 brianosman@google.com Revert "SKCMS_API"


The AutoRoll server is located here: https://skcms-skia-roll.skia.org

Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+/master/autoroll/README.md

If the roll is causing failures, please contact the current sheriff, who should
be CC'd on the roll, and stop the roller if necessary.



TBR=stani@google.com

Change-Id: Ib7f2cc3abf204e484f031c3279438285dc06f73b
Reviewed-on: https://skia-review.googlesource.com/123732
Reviewed-by: skcms-skia-autoroll <skcms-skia-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com>
Commit-Queue: skcms-skia-autoroll <skcms-skia-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com>

2 files changed, 22 insertions, 31 deletions

diff --git a/third_party/skcms/skcms.h b/third_party/skcms/skcms.h
index c84da0ab49..af0801afa4 100644
--- a/third_party/skcms/skcms.h
+++ b/third_party/skcms/skcms.h
@@ -9,12 +9,6 @@
 
 // skcms.h contains the entire public API for skcms.
 
-#if defined(__GNUC__) || defined(__clang__)
-    #define SKCMS_API __attribute__((visibility("default")))
-#else
-    #define SKCMS_API
-#endif
-
 #include <stdbool.h>
 #include <stddef.h>
 #include <stdint.h>
@@ -115,28 +109,26 @@ typedef struct skcms_ICCProfile {
 } skcms_ICCProfile;
 
 // The sRGB color profile is so commonly used that we offer a canonical skcms_ICCProfile for it.
-SKCMS_API extern const skcms_ICCProfile skcms_sRGB_profile;
+extern const skcms_ICCProfile skcms_sRGB_profile;
 // Ditto for XYZD50, the most common profile connection space.
-SKCMS_API extern const skcms_ICCProfile skcms_XYZD50_profile;
+extern const skcms_ICCProfile skcms_XYZD50_profile;
 
 // Practical equality test for two skcms_ICCProfiles.
 // The implementation is subject to change, but it will always try to answer
 // "can I substitute A for B?" and "can I skip transforming from A to B?".
-SKCMS_API bool skcms_ApproximatelyEqualProfiles(const skcms_ICCProfile* A,
-                                                const skcms_ICCProfile* B);
+bool skcms_ApproximatelyEqualProfiles(const skcms_ICCProfile* A, const skcms_ICCProfile* B);
 
 // Parse an ICC profile and return true if possible, otherwise return false.
 // The buffer is not copied, it must remain valid as long as the skcms_ICCProfile
 // will be used.
-SKCMS_API bool skcms_Parse(const void*, size_t, skcms_ICCProfile*);
+bool skcms_Parse(const void*, size_t, skcms_ICCProfile*);
 
 // skcms_Parse() creates a profile that directs skcms_Transform() to favor accuracy.
 // If you want to trade a little accuracy for a big speedup, call skcms_OptimizeForSpeed().
-SKCMS_API void skcms_OptimizeForSpeed(skcms_ICCProfile*);
+void skcms_OptimizeForSpeed(skcms_ICCProfile*);
 
-SKCMS_API bool skcms_ApproximateCurve(const skcms_Curve* curve,
-                                      skcms_TransferFunction* approx,
-                                      float* max_error);
+bool skcms_ApproximateCurve(const skcms_Curve* curve, skcms_TransferFunction* approx,
+                            float* max_error);
 
 typedef struct skcms_ICCTag {
     uint32_t       signature;
@@ -145,8 +137,8 @@ typedef struct skcms_ICCTag {
     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*);
+void skcms_GetTagByIndex    (const skcms_ICCProfile*, uint32_t idx, skcms_ICCTag*);
+bool skcms_GetTagBySignature(const skcms_ICCProfile*, uint32_t sig, skcms_ICCTag*);
 
 typedef enum skcms_PixelFormat {
     skcms_PixelFormat_RGB_565,
@@ -201,27 +193,26 @@ typedef enum skcms_AlphaFormat {
 
 // Convert npixels pixels from src format and color profile to dst format and color profile
 // and return true, otherwise return false.  It is safe to alias dst == src if dstFmt == srcFmt.
-SKCMS_API bool skcms_Transform(const void*             src,
-                               skcms_PixelFormat       srcFmt,
-                               skcms_AlphaFormat       srcAlpha,
-                               const skcms_ICCProfile* srcProfile,
-                               void*                   dst,
-                               skcms_PixelFormat       dstFmt,
-                               skcms_AlphaFormat       dstAlpha,
-                               const skcms_ICCProfile* dstProfile,
-                               size_t                  npixels);
+bool skcms_Transform(const void*             src,
+                     skcms_PixelFormat       srcFmt,
+                     skcms_AlphaFormat       srcAlpha,
+                     const skcms_ICCProfile* srcProfile,
+                     void*                   dst,
+                     skcms_PixelFormat       dstFmt,
+                     skcms_AlphaFormat       dstAlpha,
+                     const skcms_ICCProfile* dstProfile,
+                     size_t                  npixels);
 
 // If profile cannot be used as a destination profile in skcms_Transform(),
 // rewrite it with approximations where reasonable or by pulling from fallback
 // (e.g. skcms_sRGB_profile) where not.
-SKCMS_API void skcms_EnsureUsableAsDestination(skcms_ICCProfile* profile,
-                                               const skcms_ICCProfile* fallback);
+void skcms_EnsureUsableAsDestination(skcms_ICCProfile* profile, const skcms_ICCProfile* fallback);
 
 // If profile cannot be used as a destination profile with a single parametric transfer function,
 // (ie for rasterization), rewrite it with approximations where reasonable or by pulling from
 // fallback (e.g. skcms_sRGB_profile) where not.
-SKCMS_API void skcms_EnsureUsableAsDestinationWithSingleCurve(skcms_ICCProfile* profile,
-                                                              const skcms_ICCProfile* fallback);
+void skcms_EnsureUsableAsDestinationWithSingleCurve(skcms_ICCProfile* profile,
+                                                    const skcms_ICCProfile* fallback);
 
 #ifdef __cplusplus
 }
diff --git a/third_party/skcms/version.sha1 b/third_party/skcms/version.sha1
index 454bfbfc17..706461b9fc 100755
--- a/third_party/skcms/version.sha1
+++ b/third_party/skcms/version.sha1
@@ -1 +1 @@
-a893aa38b0e03f8daaa4e02d2c63bd3c84a6c68c
\ No newline at end of file
+2c9b55f528feb21094aae3fe3373ef45fcf1b4b3
\ No newline at end of file