Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
d947f6ef
Commit
d947f6ef
authored
Aug 04, 2011
by
Huw Davies
Committed by
Alexandre Julliard
Aug 04, 2011
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
gdi32: Simplify the code a little by using a separate variable for the return value.
parent
d8815170
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
17 deletions
+9
-17
dib.c
dlls/gdi32/dib.c
+9
-17
No files found.
dlls/gdi32/dib.c
View file @
d947f6ef
...
...
@@ -881,7 +881,7 @@ INT WINAPI GetDIBits(
{
DC
*
dc
;
BITMAPOBJ
*
bmp
;
int
i
;
int
i
,
ret
=
0
;
LONG
width
;
LONG
height
;
WORD
bpp
;
...
...
@@ -916,7 +916,7 @@ INT WINAPI GetDIBits(
bpp
=
dst_info
->
bmiHeader
.
biBitCount
;
if
(
bpp
==
0
)
/* query bitmap info only */
{
lines
=
fill_query_info
(
info
,
bmp
);
ret
=
fill_query_info
(
info
,
bmp
);
goto
done
;
}
...
...
@@ -1007,7 +1007,7 @@ INT WINAPI GetDIBits(
if
(
startscan
>=
dst
.
visrect
.
bottom
)
{
lines
=
1
;
/* yes, this is strange */
ret
=
1
;
/* yes, this is strange */
goto
empty_image
;
}
...
...
@@ -1053,26 +1053,18 @@ INT WINAPI GetDIBits(
}
}
if
(
empty_rect
)
{
lines
=
0
;
goto
empty_image
;
}
if
(
empty_rect
)
goto
empty_image
;
src
.
x
=
src
.
visrect
.
left
;
src
.
y
=
src
.
visrect
.
top
;
src
.
width
=
src
.
visrect
.
right
-
src
.
visrect
.
left
;
src
.
height
=
src
.
visrect
.
bottom
-
src
.
visrect
.
top
;
lines
=
src
.
height
;
err
=
funcs
->
pGetImage
(
NULL
,
hbitmap
,
src_info
,
&
src_bits
,
&
src
);
if
(
err
)
{
lines
=
0
;
goto
done
;
}
if
(
err
)
goto
done
;
ret
=
src
.
height
;
if
(
src_info
->
bmiHeader
.
biBitCount
<=
8
&&
src_info
->
bmiHeader
.
biClrUsed
==
0
)
{
...
...
@@ -1090,7 +1082,7 @@ INT WINAPI GetDIBits(
convert_bitmapinfo
(
src_info
,
src_bits
.
ptr
,
&
src
,
dst_info
,
bits
);
if
(
src_bits
.
free
)
src_bits
.
free
(
&
src_bits
);
}
else
lines
=
abs
(
height
);
else
ret
=
abs
(
height
);
empty_image:
if
(
coloruse
==
DIB_PAL_COLORS
)
...
...
@@ -1105,7 +1097,7 @@ empty_image:
done:
release_dc_ptr
(
dc
);
GDI_ReleaseObj
(
hbitmap
);
return
lines
;
return
ret
;
}
...
...
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