rpms/scribus
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
scribus/scribus-rename-byte.patch
Marek Kasik 5331e5c467 Rebuild for poppler-22.01.0 
Switch to C++17 because it is needed by poppler now
2022-01-18 17:44:10 +01:00

260 lines
13 KiB
Diff
Raw Blame History

From 80405cec3d16e607eb97c048fa7686d3062671ff Mon Sep 17 00:00:00 2001
From: Jean Ghali <jghali@libertysurf.fr>
Date: Mon, 10 Jan 2022 20:38:51 +0000
Subject: [PATCH] Rename byte() to to_byte() in order to avoid potential
conflict with std::byte in c++17 mode
git-svn-id: svn://scribus.net/trunk/Scribus@24801 11d20701-8431-0410-a711-e3c959e3b870
---
scribus/third_party/prc/oPRCFile.cc | 160 ++++++++++++++--------------
1 file changed, 80 insertions(+), 80 deletions(-)
diff --git a/scribus/third_party/prc/oPRCFile.cc b/scribus/third_party/prc/oPRCFile.cc
index 10f943165..e92aedd6b 100644
--- a/scribus/third_party/prc/oPRCFile.cc
+++ b/scribus/third_party/prc/oPRCFile.cc
@@ -74,7 +74,7 @@ using std::string;
using namespace std;
// Map [0,1] to [0,255]
-inline uint8_t byte(double r)
+inline uint8_t to_byte(double r)
{
if(r < 0.0) r=0.0;
else if(r > 1.0) r=1.0;
@@ -449,9 +449,9 @@ void oPRCFile::doGroup(PRCgroup& group)
}
if(!same_color && i>0)
{
- tess->rgba_vertices.push_back(byte(lit->color.red));
- tess->rgba_vertices.push_back(byte(lit->color.green));
- tess->rgba_vertices.push_back(byte(lit->color.blue));
+ tess->rgba_vertices.push_back(to_byte(lit->color.red));
+ tess->rgba_vertices.push_back(to_byte(lit->color.green));
+ tess->rgba_vertices.push_back(to_byte(lit->color.blue));
}
}
}
@@ -593,23 +593,23 @@ void oPRCFile::doGroup(PRCgroup& group)
triangles++;
if(!same_colour)
{
- tessFace->rgba_vertices.push_back(byte(C[1].R));
- tessFace->rgba_vertices.push_back(byte(C[1].G));
- tessFace->rgba_vertices.push_back(byte(C[1].B));
+ tessFace->rgba_vertices.push_back(to_byte(C[1].R));
+ tessFace->rgba_vertices.push_back(to_byte(C[1].G));
+ tessFace->rgba_vertices.push_back(to_byte(C[1].B));
if(tessFace->is_rgba)
- tessFace->rgba_vertices.push_back(byte(C[1].A));
+ tessFace->rgba_vertices.push_back(to_byte(C[1].A));
- tessFace->rgba_vertices.push_back(byte(C[2].R));
- tessFace->rgba_vertices.push_back(byte(C[2].G));
- tessFace->rgba_vertices.push_back(byte(C[2].B));
+ tessFace->rgba_vertices.push_back(to_byte(C[2].R));
+ tessFace->rgba_vertices.push_back(to_byte(C[2].G));
+ tessFace->rgba_vertices.push_back(to_byte(C[2].B));
if(tessFace->is_rgba)
- tessFace->rgba_vertices.push_back(byte(C[2].A));
+ tessFace->rgba_vertices.push_back(to_byte(C[2].A));
- tessFace->rgba_vertices.push_back(byte(C[3].R));
- tessFace->rgba_vertices.push_back(byte(C[3].G));
- tessFace->rgba_vertices.push_back(byte(C[3].B));
+ tessFace->rgba_vertices.push_back(to_byte(C[3].R));
+ tessFace->rgba_vertices.push_back(to_byte(C[3].G));
+ tessFace->rgba_vertices.push_back(to_byte(C[3].B));
if(tessFace->is_rgba)
- tessFace->rgba_vertices.push_back(byte(C[3].A));
+ tessFace->rgba_vertices.push_back(to_byte(C[3].A));
}
}
else
@@ -620,23 +620,23 @@ void oPRCFile::doGroup(PRCgroup& group)
triangles++;
if(!same_colour)
{
- tessFace->rgba_vertices.push_back(byte(C[0].R));
- tessFace->rgba_vertices.push_back(byte(C[0].G));
- tessFace->rgba_vertices.push_back(byte(C[0].B));
+ tessFace->rgba_vertices.push_back(to_byte(C[0].R));
+ tessFace->rgba_vertices.push_back(to_byte(C[0].G));
+ tessFace->rgba_vertices.push_back(to_byte(C[0].B));
if(tessFace->is_rgba)
- tessFace->rgba_vertices.push_back(byte(C[0].A));
+ tessFace->rgba_vertices.push_back(to_byte(C[0].A));
- tessFace->rgba_vertices.push_back(byte(C[2].R));
- tessFace->rgba_vertices.push_back(byte(C[2].G));
- tessFace->rgba_vertices.push_back(byte(C[2].B));
+ tessFace->rgba_vertices.push_back(to_byte(C[2].R));
+ tessFace->rgba_vertices.push_back(to_byte(C[2].G));
+ tessFace->rgba_vertices.push_back(to_byte(C[2].B));
if(tessFace->is_rgba)
- tessFace->rgba_vertices.push_back(byte(C[2].A));
+ tessFace->rgba_vertices.push_back(to_byte(C[2].A));
- tessFace->rgba_vertices.push_back(byte(C[3].R));
- tessFace->rgba_vertices.push_back(byte(C[3].G));
- tessFace->rgba_vertices.push_back(byte(C[3].B));
+ tessFace->rgba_vertices.push_back(to_byte(C[3].R));
+ tessFace->rgba_vertices.push_back(to_byte(C[3].G));
+ tessFace->rgba_vertices.push_back(to_byte(C[3].B));
if(tessFace->is_rgba)
- tessFace->rgba_vertices.push_back(byte(C[3].A));
+ tessFace->rgba_vertices.push_back(to_byte(C[3].A));
}
tess->triangulated_index.push_back(vertex_indices[3]);
tess->triangulated_index.push_back(vertex_indices[1]);
@@ -644,23 +644,23 @@ void oPRCFile::doGroup(PRCgroup& group)
triangles++;
if(!same_colour)
{
- tessFace->rgba_vertices.push_back(byte(C[3].R));
- tessFace->rgba_vertices.push_back(byte(C[3].G));
- tessFace->rgba_vertices.push_back(byte(C[3].B));
+ tessFace->rgba_vertices.push_back(to_byte(C[3].R));
+ tessFace->rgba_vertices.push_back(to_byte(C[3].G));
+ tessFace->rgba_vertices.push_back(to_byte(C[3].B));
if(tessFace->is_rgba)
- tessFace->rgba_vertices.push_back(byte(C[3].A));
+ tessFace->rgba_vertices.push_back(to_byte(C[3].A));
- tessFace->rgba_vertices.push_back(byte(C[1].R));
- tessFace->rgba_vertices.push_back(byte(C[1].G));
- tessFace->rgba_vertices.push_back(byte(C[1].B));
+ tessFace->rgba_vertices.push_back(to_byte(C[1].R));
+ tessFace->rgba_vertices.push_back(to_byte(C[1].G));
+ tessFace->rgba_vertices.push_back(to_byte(C[1].B));
if(tessFace->is_rgba)
- tessFace->rgba_vertices.push_back(byte(C[1].A));
+ tessFace->rgba_vertices.push_back(to_byte(C[1].A));
- tessFace->rgba_vertices.push_back(byte(C[0].R));
- tessFace->rgba_vertices.push_back(byte(C[0].G));
- tessFace->rgba_vertices.push_back(byte(C[0].B));
+ tessFace->rgba_vertices.push_back(to_byte(C[0].R));
+ tessFace->rgba_vertices.push_back(to_byte(C[0].G));
+ tessFace->rgba_vertices.push_back(to_byte(C[0].B));
if(tessFace->is_rgba)
- tessFace->rgba_vertices.push_back(byte(C[0].A));
+ tessFace->rgba_vertices.push_back(to_byte(C[0].A));
}
}
}
@@ -1648,21 +1648,21 @@ uint32_t oPRCFile::createTriangleMesh(uint32_t nP, const double P[][3], uint32_t
tessFace->rgba_vertices.reserve((tessFace->is_rgba?4:3)*3*nI);
for(uint32_t i=0; i<nI; i++)
{
- tessFace->rgba_vertices.push_back(byte(C[CI[i][0]].R));
- tessFace->rgba_vertices.push_back(byte(C[CI[i][0]].G));
- tessFace->rgba_vertices.push_back(byte(C[CI[i][0]].B));
+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][0]].R));
+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][0]].G));
+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][0]].B));
if(tessFace->is_rgba)
- tessFace->rgba_vertices.push_back(byte(C[CI[i][0]].A));
- tessFace->rgba_vertices.push_back(byte(C[CI[i][1]].R));
- tessFace->rgba_vertices.push_back(byte(C[CI[i][1]].G));
- tessFace->rgba_vertices.push_back(byte(C[CI[i][1]].B));
+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][0]].A));
+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][1]].R));
+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][1]].G));
+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][1]].B));
if(tessFace->is_rgba)
- tessFace->rgba_vertices.push_back(byte(C[CI[i][1]].A));
- tessFace->rgba_vertices.push_back(byte(C[CI[i][2]].R));
- tessFace->rgba_vertices.push_back(byte(C[CI[i][2]].G));
- tessFace->rgba_vertices.push_back(byte(C[CI[i][2]].B));
+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][1]].A));
+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][2]].R));
+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][2]].G));
+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][2]].B));
if(tessFace->is_rgba)
- tessFace->rgba_vertices.push_back(byte(C[CI[i][2]].A));
+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][2]].A));
}
}
tess->addTessFace(tessFace);
@@ -1792,37 +1792,37 @@ uint32_t oPRCFile::createQuadMesh(uint32_t nP, const double P[][3], uint32_t nI,
for(uint32_t i=0; i<nI; i++)
{
// first triangle
- tessFace->rgba_vertices.push_back(byte(C[CI[i][0]].R));
- tessFace->rgba_vertices.push_back(byte(C[CI[i][0]].G));
- tessFace->rgba_vertices.push_back(byte(C[CI[i][0]].B));
+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][0]].R));
+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][0]].G));
+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][0]].B));
if(tessFace->is_rgba)
- tessFace->rgba_vertices.push_back(byte(C[CI[i][0]].A));
- tessFace->rgba_vertices.push_back(byte(C[CI[i][1]].R));
- tessFace->rgba_vertices.push_back(byte(C[CI[i][1]].G));
- tessFace->rgba_vertices.push_back(byte(C[CI[i][1]].B));
+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][0]].A));
+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][1]].R));
+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][1]].G));
+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][1]].B));
if(tessFace->is_rgba)
- tessFace->rgba_vertices.push_back(byte(C[CI[i][1]].A));
- tessFace->rgba_vertices.push_back(byte(C[CI[i][3]].R));
- tessFace->rgba_vertices.push_back(byte(C[CI[i][3]].G));
- tessFace->rgba_vertices.push_back(byte(C[CI[i][3]].B));
+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][1]].A));
+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][3]].R));
+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][3]].G));
+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][3]].B));
if(tessFace->is_rgba)
- tessFace->rgba_vertices.push_back(byte(C[CI[i][3]].A));
+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][3]].A));
// second triangle
- tessFace->rgba_vertices.push_back(byte(C[CI[i][1]].R));
- tessFace->rgba_vertices.push_back(byte(C[CI[i][1]].G));
- tessFace->rgba_vertices.push_back(byte(C[CI[i][1]].B));
+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][1]].R));
+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][1]].G));
+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][1]].B));
if(tessFace->is_rgba)
- tessFace->rgba_vertices.push_back(byte(C[CI[i][1]].A));
- tessFace->rgba_vertices.push_back(byte(C[CI[i][2]].R));
- tessFace->rgba_vertices.push_back(byte(C[CI[i][2]].G));
- tessFace->rgba_vertices.push_back(byte(C[CI[i][2]].B));
+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][1]].A));
+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][2]].R));
+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][2]].G));
+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][2]].B));
if(tessFace->is_rgba)
- tessFace->rgba_vertices.push_back(byte(C[CI[i][2]].A));
- tessFace->rgba_vertices.push_back(byte(C[CI[i][3]].R));
- tessFace->rgba_vertices.push_back(byte(C[CI[i][3]].G));
- tessFace->rgba_vertices.push_back(byte(C[CI[i][3]].B));
+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][2]].A));
+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][3]].R));
+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][3]].G));
+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][3]].B));
if(tessFace->is_rgba)
- tessFace->rgba_vertices.push_back(byte(C[CI[i][3]].A));
+ tessFace->rgba_vertices.push_back(to_byte(C[CI[i][3]].A));
}
}
tess->addTessFace(tessFace);
@@ -1910,11 +1910,11 @@ uint32_t oPRCFile::createLines(uint32_t nP, const double P[][3], uint32_t nI, co
tess->rgba_vertices.reserve((tess->is_rgba?4:3)*nCI);
for(uint32_t i=0; i<nCI; i++)
{
- tess->rgba_vertices.push_back(byte(C[CI[i]].R));
- tess->rgba_vertices.push_back(byte(C[CI[i]].G));
- tess->rgba_vertices.push_back(byte(C[CI[i]].B));
+ tess->rgba_vertices.push_back(to_byte(C[CI[i]].R));
+ tess->rgba_vertices.push_back(to_byte(C[CI[i]].G));
+ tess->rgba_vertices.push_back(to_byte(C[CI[i]].B));
if(tess->is_rgba)
- tess->rgba_vertices.push_back(byte(C[CI[i]].A));
+ tess->rgba_vertices.push_back(to_byte(C[CI[i]].A));
}
}
const uint32_t tess_index = add3DWireTess(tess);
--
2.34.1
Reference in a new issue View git blame Copy permalink