Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
itdan3344
stb
提交
ab4fb5c3
S
stb
项目概览
itdan3344
/
stb
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
S
stb
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
ab4fb5c3
编写于
1月 29, 2018
作者:
S
Sean Barrett
浏览文件
操作
浏览文件
下载
差异文件
Merge branch '1bit_bmp' of
https://github.com/plzombie/stb
上级
b0383fac
35017302
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
36 addition
and
19 deletion
+36
-19
stb_image.h
stb_image.h
+36
-19
未找到文件。
stb_image.h
浏览文件 @
ab4fb5c3
...
...
@@ -5014,7 +5014,6 @@ static void *stbi__bmp_parse_header(stbi__context *s, stbi__bmp_data *info)
}
if
(
stbi__get16le
(
s
)
!=
1
)
return
stbi__errpuc
(
"bad BMP"
,
"bad BMP"
);
info
->
bpp
=
stbi__get16le
(
s
);
if
(
info
->
bpp
==
1
)
return
stbi__errpuc
(
"monochrome"
,
"BMP type not supported: 1-bit"
);
if
(
hsz
!=
12
)
{
int
compress
=
stbi__get32le
(
s
);
if
(
compress
==
1
||
compress
==
2
)
return
stbi__errpuc
(
"BMP RLE"
,
"BMP type not supported: RLE"
);
...
...
@@ -5132,29 +5131,47 @@ static void *stbi__bmp_load(stbi__context *s, int *x, int *y, int *comp, int req
pal
[
i
][
3
]
=
255
;
}
stbi__skip
(
s
,
info
.
offset
-
14
-
info
.
hsz
-
psize
*
(
info
.
hsz
==
12
?
3
:
4
));
if
(
info
.
bpp
==
4
)
width
=
(
s
->
img_x
+
1
)
>>
1
;
if
(
info
.
bpp
==
1
)
width
=
(
s
->
img_x
+
7
)
>>
3
;
else
if
(
info
.
bpp
==
4
)
width
=
(
s
->
img_x
+
1
)
>>
1
;
else
if
(
info
.
bpp
==
8
)
width
=
s
->
img_x
;
else
{
STBI_FREE
(
out
);
return
stbi__errpuc
(
"bad bpp"
,
"Corrupt BMP"
);
}
pad
=
(
-
width
)
&
3
;
for
(
j
=
0
;
j
<
(
int
)
s
->
img_y
;
++
j
)
{
for
(
i
=
0
;
i
<
(
int
)
s
->
img_x
;
i
+=
2
)
{
int
v
=
stbi__get8
(
s
),
v2
=
0
;
if
(
info
.
bpp
==
4
)
{
v2
=
v
&
15
;
v
>>=
4
;
if
(
info
.
bpp
==
1
)
{
for
(
j
=
0
;
j
<
(
int
)
s
->
img_y
;
++
j
)
{
int
bit_offset
=
7
,
v
=
stbi__get8
(
s
);
for
(
i
=
0
;
i
<
(
int
)
s
->
img_x
;
++
i
)
{
int
color
=
(
v
>>
bit_offset
)
&
0x1
;
out
[
z
++
]
=
pal
[
color
][
0
];
out
[
z
++
]
=
pal
[
color
][
1
];
out
[
z
++
]
=
pal
[
color
][
2
];
if
((
--
bit_offset
)
<
0
)
{
bit_offset
=
7
;
v
=
stbi__get8
(
s
);
}
}
out
[
z
++
]
=
pal
[
v
][
0
];
out
[
z
++
]
=
pal
[
v
][
1
];
out
[
z
++
]
=
pal
[
v
][
2
];
if
(
target
==
4
)
out
[
z
++
]
=
255
;
if
(
i
+
1
==
(
int
)
s
->
img_x
)
break
;
v
=
(
info
.
bpp
==
8
)
?
stbi__get8
(
s
)
:
v2
;
out
[
z
++
]
=
pal
[
v
][
0
];
out
[
z
++
]
=
pal
[
v
][
1
];
out
[
z
++
]
=
pal
[
v
][
2
];
if
(
target
==
4
)
out
[
z
++
]
=
255
;
stbi__skip
(
s
,
pad
);
}
}
else
{
for
(
j
=
0
;
j
<
(
int
)
s
->
img_y
;
++
j
)
{
for
(
i
=
0
;
i
<
(
int
)
s
->
img_x
;
i
+=
2
)
{
int
v
=
stbi__get8
(
s
),
v2
=
0
;
if
(
info
.
bpp
==
4
)
{
v2
=
v
&
15
;
v
>>=
4
;
}
out
[
z
++
]
=
pal
[
v
][
0
];
out
[
z
++
]
=
pal
[
v
][
1
];
out
[
z
++
]
=
pal
[
v
][
2
];
if
(
target
==
4
)
out
[
z
++
]
=
255
;
if
(
i
+
1
==
(
int
)
s
->
img_x
)
break
;
v
=
(
info
.
bpp
==
8
)
?
stbi__get8
(
s
)
:
v2
;
out
[
z
++
]
=
pal
[
v
][
0
];
out
[
z
++
]
=
pal
[
v
][
1
];
out
[
z
++
]
=
pal
[
v
][
2
];
if
(
target
==
4
)
out
[
z
++
]
=
255
;
}
stbi__skip
(
s
,
pad
);
}
stbi__skip
(
s
,
pad
);
}
}
else
{
int
rshift
=
0
,
gshift
=
0
,
bshift
=
0
,
ashift
=
0
,
rcount
=
0
,
gcount
=
0
,
bcount
=
0
,
acount
=
0
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录