Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
N
nx-libs
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
1
Issues
1
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
dimbor
nx-libs
Commits
0e2b7479
Unverified
Commit
0e2b7479
authored
Jan 05, 2020
by
Mike Gabriel
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'uli42-pr/simplify_nxrender' into 3.6.x
Attributes GH PR #862:
https://github.com/ArcticaProject/nx-libs/pull/862
parents
60e0566d
3bc01d1b
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
21 additions
and
6 deletions
+21
-6
NXrender.c
nx-X11/programs/Xserver/hw/nxagent/NXrender.c
+0
-0
render.c
nx-X11/programs/Xserver/render/render.c
+21
-6
No files found.
nx-X11/programs/Xserver/hw/nxagent/NXrender.c
View file @
0e2b7479
This diff is collapsed.
Click to expand it.
nx-X11/programs/Xserver/render/render.c
View file @
0e2b7479
...
...
@@ -126,6 +126,11 @@ static int SProcRenderCreateConicalGradient (ClientPtr pClient);
static
int
SProcRenderDispatch
(
ClientPtr
pClient
);
#ifdef NXAGENT_SERVER
static
int
xorg_ProcRenderDispatch
(
ClientPtr
pClient
);
static
int
xorg_SProcRenderDispatch
(
ClientPtr
pClient
);
#endif
int
(
*
ProcRenderVector
[
RenderNumberRequests
])(
ClientPtr
)
=
{
ProcRenderQueryVersion
,
ProcRenderQueryPictFormats
,
...
...
@@ -1347,9 +1352,8 @@ ProcRenderCompositeGlyphs (ClientPtr client)
listsBase
=
(
GlyphListPtr
)
malloc
(
nlist
*
sizeof
(
GlyphListRec
));
if
(
!
listsBase
)
{
if
(
glyphsBase
!=
glyphsLocal
)
free
(
glyphsBase
);
free
(
listsBase
);
return
BadAlloc
;
}
}
...
...
@@ -1417,8 +1421,13 @@ ProcRenderCompositeGlyphs (ClientPtr client)
}
}
if
(
buffer
>
end
)
{
if
(
glyphsBase
!=
glyphsLocal
)
free
(
glyphsBase
);
if
(
listsBase
!=
listsLocal
)
free
(
listsBase
);
return
BadLength
;
}
CompositeGlyphs
(
stuff
->
op
,
pSrc
,
pDst
,
...
...
@@ -2018,10 +2027,15 @@ static int ProcRenderCreateConicalGradient (ClientPtr client)
return
BadAlloc
;
return
Success
;
}
#endif
/* NXAGENT_SERVER */
static
int
#ifdef NXAGENT_SERVER
xorg_ProcRenderDispatch
(
ClientPtr
client
)
#else
ProcRenderDispatch
(
ClientPtr
client
)
#endif
{
REQUEST
(
xReq
);
...
...
@@ -2030,7 +2044,6 @@ ProcRenderDispatch (ClientPtr client)
else
return
BadRequest
;
}
#endif
/* NXAGENT_SERVER */
static
int
SProcRenderQueryVersion
(
ClientPtr
client
)
...
...
@@ -2602,9 +2615,12 @@ SProcRenderCreateConicalGradient (ClientPtr client)
return
(
*
ProcRenderVector
[
stuff
->
renderReqType
])
(
client
);
}
#if
n
def NXAGENT_SERVER
#ifdef NXAGENT_SERVER
static
int
xorg_SProcRenderDispatch
(
ClientPtr
client
)
#else
SProcRenderDispatch
(
ClientPtr
client
)
#endif
{
REQUEST
(
xReq
);
...
...
@@ -2613,7 +2629,6 @@ SProcRenderDispatch (ClientPtr client)
else
return
BadRequest
;
}
#endif
/* NXAGENT_SERVER */
#ifdef PANORAMIX
#include "panoramiX.h"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment