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
eca10741
Commit
eca10741
authored
Jul 13, 2012
by
Dmitry Timoshkov
Committed by
Alexandre Julliard
Jul 16, 2012
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
gdiplus: Make sure that 1bpp bitmap images get loaded in native format.
parent
81cbf29e
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
3 deletions
+5
-3
image.c
dlls/gdiplus/image.c
+4
-0
image.c
dlls/gdiplus/tests/image.c
+1
-3
No files found.
dlls/gdiplus/image.c
View file @
eca10741
...
...
@@ -2908,6 +2908,8 @@ GpStatus WINGDIPAPI GdipLoadImageFromFileICM(GDIPCONST WCHAR* filename,GpImage *
}
static
const
WICPixelFormatGUID
*
const
wic_pixel_formats
[]
=
{
&
GUID_WICPixelFormatBlackWhite
,
&
GUID_WICPixelFormat1bppIndexed
,
&
GUID_WICPixelFormat16bppBGR555
,
&
GUID_WICPixelFormat24bppBGR
,
&
GUID_WICPixelFormat32bppBGR
,
...
...
@@ -2917,6 +2919,8 @@ static const WICPixelFormatGUID * const wic_pixel_formats[] = {
};
static
const
PixelFormat
wic_gdip_formats
[]
=
{
PixelFormat1bppIndexed
,
PixelFormat1bppIndexed
,
PixelFormat16bppRGB555
,
PixelFormat24bppRGB
,
PixelFormat32bppRGB
,
...
...
dlls/gdiplus/tests/image.c
View file @
eca10741
...
...
@@ -3326,7 +3326,6 @@ static void test_tiff_palette(void)
status
=
GdipGetImagePixelFormat
(
image
,
&
format
);
expect
(
Ok
,
status
);
todo_wine
ok
(
format
==
PixelFormat1bppIndexed
,
"expected PixelFormat1bppIndexed, got %#x
\n
"
,
format
);
status
=
GdipGetImagePaletteSize
(
image
,
&
size
);
...
...
@@ -3337,13 +3336,12 @@ todo_wine
GdipDisposeImage
(
image
);
return
;
}
todo_wine
expect
(
sizeof
(
ColorPalette
)
+
sizeof
(
ARGB
),
size
);
status
=
GdipGetImagePalette
(
image
,
&
palette
.
pal
,
size
);
expect
(
Ok
,
status
);
expect
(
0
,
palette
.
pal
.
Flags
);
todo_wine
expect
(
0
,
palette
.
pal
.
Flags
);
expect
(
2
,
palette
.
pal
.
Count
);
if
(
palette
.
pal
.
Count
==
2
)
{
...
...
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