Remove use of deprecated 'register' keyword
Bug: chromium:780692
Change-Id: I16e7d071b1375e8a31e785141a8af5b4c103f81b
Reviewed-on: https://pdfium-review.googlesource.com/17390
Commit-Queue: Lei Zhang <thestig@chromium.org>
Commit-Queue: Hans Wennborg <hans@chromium.org>
Reviewed-by: Lei Zhang <thestig@chromium.org>
diff --git a/third_party/lcms/0029-drop-register-keyword.patch b/third_party/lcms/0029-drop-register-keyword.patch
new file mode 100644
index 0000000..7680f2c
--- /dev/null
+++ b/third_party/lcms/0029-drop-register-keyword.patch
@@ -0,0 +1,24 @@
+diff --git a/third_party/lcms/include/lcms2.h b/third_party/lcms/include/lcms2.h
+index c84a4fd93..2bf6f2472 100644
+--- a/third_party/lcms/include/lcms2.h
++++ b/third_party/lcms/include/lcms2.h
+@@ -1239,13 +1239,13 @@ CMSAPI cmsStageSignature CMSEXPORT cmsStageType(const cmsStage* mpe);
+ CMSAPI void* CMSEXPORT cmsStageData(const cmsStage* mpe);
+
+ // Sampling
+-typedef cmsInt32Number (* cmsSAMPLER16) (register const cmsUInt16Number In[],
+- register cmsUInt16Number Out[],
+- register void * Cargo);
++typedef cmsInt32Number (*cmsSAMPLER16)(const cmsUInt16Number In[],
++ cmsUInt16Number Out[],
++ void* Cargo);
+
+-typedef cmsInt32Number (* cmsSAMPLERFLOAT)(register const cmsFloat32Number In[],
+- register cmsFloat32Number Out[],
+- register void * Cargo);
++typedef cmsInt32Number (*cmsSAMPLERFLOAT)(const cmsFloat32Number In[],
++ cmsFloat32Number Out[],
++ void* Cargo);
+
+ // Use this flag to prevent changes being written to destination
+ #define SAMPLER_INSPECT 0x01000000
diff --git a/third_party/lcms/README.pdfium b/third_party/lcms/README.pdfium
index f8fe7e7..b04da7d 100644
--- a/third_party/lcms/README.pdfium
+++ b/third_party/lcms/README.pdfium
@@ -40,3 +40,4 @@
0026-more-unsupported-characters.patch: remove other unsupported characters.
0027-changes-from-beginning-of-time.patch: commented changes from initial commit.
0028-do-not-quickfloor.patch: flooring errors may cause heap-buffer-overflow.
+0029-drop-register-keyword.patch: Remove deprecated 'register' keyword.
diff --git a/third_party/lcms/include/lcms2.h b/third_party/lcms/include/lcms2.h
index c84a4fd..2bf6f24 100644
--- a/third_party/lcms/include/lcms2.h
+++ b/third_party/lcms/include/lcms2.h
@@ -1239,13 +1239,13 @@
CMSAPI void* CMSEXPORT cmsStageData(const cmsStage* mpe);
// Sampling
-typedef cmsInt32Number (* cmsSAMPLER16) (register const cmsUInt16Number In[],
- register cmsUInt16Number Out[],
- register void * Cargo);
+typedef cmsInt32Number (*cmsSAMPLER16)(const cmsUInt16Number In[],
+ cmsUInt16Number Out[],
+ void* Cargo);
-typedef cmsInt32Number (* cmsSAMPLERFLOAT)(register const cmsFloat32Number In[],
- register cmsFloat32Number Out[],
- register void * Cargo);
+typedef cmsInt32Number (*cmsSAMPLERFLOAT)(const cmsFloat32Number In[],
+ cmsFloat32Number Out[],
+ void* Cargo);
// Use this flag to prevent changes being written to destination
#define SAMPLER_INSPECT 0x01000000
