Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
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-cw
Commits
577740f0
Commit
577740f0
authored
Jul 12, 2012
by
Vincent Povirk
Committed by
Alexandre Julliard
Jul 12, 2012
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
gdiplus: Fix GdipImageRotateFlip for images from streams.
parent
c5820b79
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
17 additions
and
2 deletions
+17
-2
image.c
dlls/gdiplus/image.c
+6
-2
image.c
dlls/gdiplus/tests/image.c
+11
-0
No files found.
dlls/gdiplus/image.c
View file @
577740f0
...
...
@@ -1971,8 +1971,6 @@ static void move_bitmap(GpBitmap *dst, GpBitmap *src, BOOL clobber_palette)
{
assert
(
src
->
image
.
type
==
ImageTypeBitmap
);
assert
(
dst
->
image
.
type
==
ImageTypeBitmap
);
assert
(
src
->
image
.
stream
==
NULL
);
assert
(
dst
->
image
.
stream
==
NULL
);
GdipFree
(
dst
->
bitmapbits
);
DeleteDC
(
dst
->
hdc
);
...
...
@@ -2001,6 +1999,12 @@ static void move_bitmap(GpBitmap *dst, GpBitmap *src, BOOL clobber_palette)
if
(
dst
->
metadata_reader
)
IWICMetadataReader_Release
(
dst
->
metadata_reader
);
dst
->
metadata_reader
=
src
->
metadata_reader
;
if
(
dst
->
image
.
stream
)
IStream_Release
(
dst
->
image
.
stream
);
dst
->
image
.
stream
=
src
->
image
.
stream
;
dst
->
image
.
frame_count
=
src
->
image
.
frame_count
;
dst
->
image
.
current_frame
=
src
->
image
.
current_frame
;
dst
->
image
.
format
=
src
->
image
.
format
;
src
->
image
.
type
=
~
0
;
GdipFree
(
src
);
...
...
dlls/gdiplus/tests/image.c
View file @
577740f0
...
...
@@ -2345,6 +2345,17 @@ static void test_multiframegif(void)
expect
(
Ok
,
stat
);
expect
(
0xffffffff
,
color
);
/* rotate/flip discards the information about other frames */
stat
=
GdipImageRotateFlip
((
GpImage
*
)
bmp
,
Rotate90FlipNone
);
expect
(
Ok
,
stat
);
count
=
12345
;
stat
=
GdipImageGetFrameCount
((
GpImage
*
)
bmp
,
&
dimension
,
&
count
);
expect
(
Ok
,
stat
);
expect
(
1
,
count
);
expect_rawformat
(
&
ImageFormatMemoryBMP
,
(
GpImage
*
)
bmp
,
__LINE__
,
FALSE
);
GdipDisposeImage
((
GpImage
*
)
bmp
);
IStream_Release
(
stream
);
...
...
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