Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
Synchronet
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Main
Synchronet
Commits
b2a77434
Commit
b2a77434
authored
4 months ago
by
Deucе
Browse files
Options
Downloads
Patches
Plain Diff
We don't need to multiply the row by cols anymore.
parent
1f9fb219
No related branches found
No related tags found
No related merge requests found
Pipeline
#7735
passed
4 months ago
Stage: build
Stage: test
Stage: cleanup
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/conio/bitmap_con.c
+3
-3
3 additions, 3 deletions
src/conio/bitmap_con.c
with
3 additions
and
3 deletions
src/conio/bitmap_con.c
+
3
−
3
View file @
b2a77434
...
...
@@ -1738,7 +1738,7 @@ int bitmap_setpixel(uint32_t x, uint32_t y, uint32_t colour)
update_from_vmem
(
FALSE
);
pthread_mutex_lock
(
&
vstatlock
);
struct
vstat_vmem
*
vmem_ptr
=
get_vmem
(
&
vstat
);
struct
vmem_cell
*
vc
=
vmem_cell_ptr
(
vmem_ptr
,
x
/
vstat
.
charwidth
,
y
/
vstat
.
charheight
*
vstat
.
cols
);
struct
vmem_cell
*
vc
=
vmem_cell_ptr
(
vmem_ptr
,
x
/
vstat
.
charwidth
,
y
/
vstat
.
charheight
);
vc
->
bg
|=
0x04000000
;
vc
->
bg
|=
0x04000000
;
release_vmem
(
vmem_ptr
);
...
...
@@ -1807,7 +1807,7 @@ int bitmap_setpixels(uint32_t sx, uint32_t sy, uint32_t ex, uint32_t ey, uint32_
pos
=
pixels
->
width
*
(
y
-
sy
+
y_off
)
+
x_off
;
if
(
mask
==
NULL
)
{
for
(
x
=
sx
;
x
<=
ex
;
x
++
)
{
struct
vmem_cell
*
vc
=
vmem_cell_ptr
(
vmem_ptr
,
x
/
vstat
.
charwidth
,
y
/
vstat
.
charheight
*
vstat
.
cols
);
struct
vmem_cell
*
vc
=
vmem_cell_ptr
(
vmem_ptr
,
x
/
vstat
.
charwidth
,
y
/
vstat
.
charheight
);
vc
->
bg
|=
0x04000000
;
vc
->
bg
|=
0x04000000
;
if
(
screena
.
rect
->
data
[
pixel_offset
(
&
screena
,
x
,
y
)]
!=
pixels
->
pixels
[
pos
])
{
...
...
@@ -1832,7 +1832,7 @@ int bitmap_setpixels(uint32_t sx, uint32_t sy, uint32_t ex, uint32_t ey, uint32_
else
{
mpos
=
mask
->
width
*
(
y
-
sy
+
my_off
)
+
mx_off
;
for
(
x
=
sx
;
x
<=
ex
;
x
++
)
{
struct
vmem_cell
*
vc
=
vmem_cell_ptr
(
vmem_ptr
,
x
/
vstat
.
charwidth
,
y
/
vstat
.
charheight
*
vstat
.
cols
);
struct
vmem_cell
*
vc
=
vmem_cell_ptr
(
vmem_ptr
,
x
/
vstat
.
charwidth
,
y
/
vstat
.
charheight
);
vc
->
bg
|=
0x04000000
;
vc
->
bg
|=
0x04000000
;
mask_byte
=
mpos
/
8
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment