[libraw] Remove register in cpp (#26009)

* libraw remove register cpp

* v db

* move patch to the correct location

* v db
This commit is contained in:
Alexander Neumann 2022-07-29 00:49:19 +02:00 committed by GitHub
parent 9430b3c760
commit 162a88fa44
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 40 additions and 2 deletions

View File

@ -4,6 +4,8 @@ vcpkg_from_github(
REF d4f05dd1b9b2d44c8f7e82043cbad3c724db2416
SHA512 5794521f535163afd7815ad005295301c5e0e2f8b2f34ef0a911d9dd1572c1f456b292777548203f9767957a55782b5bc9041c033190d25d1e9b4240d7df32b9
HEAD_REF master
PATCHES
remove_register_cpp.patch
)
vcpkg_from_github(

View File

@ -0,0 +1,31 @@
diff --git a/src/libraw_cxx.cpp b/src/libraw_cxx.cpp
index 0abd5329a..5eea00ea9 100644
--- a/src/libraw_cxx.cpp
+++ b/src/libraw_cxx.cpp
@@ -3500,7 +3500,7 @@ int LibRaw::phase_one_subtract_black(ushort *src, ushort *dest)
{
if (!imgdata.rawdata.ph1_cblack || !imgdata.rawdata.ph1_rblack)
{
- register int bl = imgdata.color.phase_one_data.t_black;
+ int bl = imgdata.color.phase_one_data.t_black;
for (int row = 0; row < S.raw_height; row++)
{
checkCancel();
@@ -3514,7 +3514,7 @@ int LibRaw::phase_one_subtract_black(ushort *src, ushort *dest)
}
else
{
- register int bl = imgdata.color.phase_one_data.t_black;
+ int bl = imgdata.color.phase_one_data.t_black;
for (int row = 0; row < S.raw_height; row++)
{
checkCancel();
@@ -6467,7 +6467,7 @@ static void utf2char(utf16_t *str, char *buffer, unsigned bufsz)
static void *lr_memmem(const void *l, size_t l_len, const void *s, size_t s_len)
{
- register char *cur, *last;
+ char *cur, *last;
const char *cl = (const char *)l;
const char *cs = (const char *)s;

View File

@ -1,7 +1,7 @@
{
"name": "libraw",
"version-string": "201903",
"port-version": 9,
"port-version": 10,
"description": "raw image decoder library",
"homepage": "https://www.libraw.org",
"supports": "!uwp",

View File

@ -4010,7 +4010,7 @@
},
"libraw": {
"baseline": "201903",
"port-version": 9
"port-version": 10
},
"librdkafka": {
"baseline": "1.9.0",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "906477f849ef0c2b348f8ff9f526d2c5a2e19b22",
"version-string": "201903",
"port-version": 10
},
{
"git-tree": "13ab93771f3879d0f68e0418b028df14cb260dd3",
"version-string": "201903",