[prev in list] [next in list] [prev in thread] [next in thread]
List: graphicsmagick-commit
Subject: [GM-commit] GraphicsMagick: 3 new changesets
From: GraphicsMagick Commits <graphicsmagick-commit () lists ! sourceforge ! net>
Date: 2023-08-15 22:40:36
Message-ID: mailman.9369.1692139247.1374.graphicsmagick-commit () lists ! sourceforge ! net
[Download RAW message or body]
changeset da9cc0a5c692 in /hg/GraphicsMagick
details: http://hg.GraphicsMagick.org/hg/GraphicsMagick?cmd=changeset;node=da9cc0a5c692
summary: Tidy
changeset fc6806508de3 in /hg/GraphicsMagick
details: http://hg.GraphicsMagick.org/hg/GraphicsMagick?cmd=changeset;node=fc6806508de3
summary: Tidy
changeset 8eff3224f83c in /hg/GraphicsMagick
details: http://hg.GraphicsMagick.org/hg/GraphicsMagick?cmd=changeset;node=8eff3224f83c
summary: Update generated files
diffstat:
ChangeLog | 3 +-
coders/bmp.c | 70 +++++++++++++++++++++++++++---------------------------
www/Changelog.html | 12 +++++++++
3 files changed, 48 insertions(+), 37 deletions(-)
diffs (136 lines):
diff -r ddabe3fa0039 -r 8eff3224f83c ChangeLog
--- a/ChangeLog Tue Aug 15 22:53:59 2023 +0200
+++ b/ChangeLog Tue Aug 15 17:40:34 2023 -0500
@@ -4,8 +4,7 @@
2023-08-15 Fojtik Jaroslav <JaFojtik@yandex.com>
- * coders/tiff.c Fix compillation problem in MSVC.
-
+ * coders/tiff.c Fix compilation problem in MSVC.
2023-08-15 Bob Friesenhahn <bfriesen@simple.dallas.tx.us>
diff -r ddabe3fa0039 -r 8eff3224f83c coders/bmp.c
--- a/coders/bmp.c Tue Aug 15 22:53:59 2023 +0200
+++ b/coders/bmp.c Tue Aug 15 17:40:34 2023 -0500
@@ -728,9 +728,9 @@
case 108: break;
default: if (bmp_info.size < 64)
ThrowBMPReaderException(CorruptImageError, NonOS2HeaderSizeError, \
image);
- /* A value larger than 64 indicates a later version of the \
OS/2 BMP format.
- .... as far as OS/2 development caesed we could consider \
to
- close this Trojan's horse window in future. */
+ /* A value larger than 64 indicates a later version of the OS/2 BMP \
format. + .... as far as OS/2 development caesed we could consider to
+ close this Trojan's horse window in future. */
break;
}
@@ -1255,44 +1255,44 @@
/*
Convert BMP raster image to pixel packets.
*/
-/*
- if (bmp_info.compression == BI_RGB)
+ /*
+ if (bmp_info.compression == BI_RGB)
{
- bmp_info.alpha_mask=(image->matte ? 0xff000000U : 0U);
- bmp_info.red_mask=0x00ff0000U;
- bmp_info.green_mask=0x0000ff00U;
- bmp_info.blue_mask=0x000000ffU;
- if (bmp_info.bits_per_pixel == 16)
- {
- // RGB555. JFO: Please consider whether this is correct ?? I guess \
RGB 565!
- bmp_info.red_mask=0x00007c00U;
- bmp_info.green_mask=0x000003e0U;
- bmp_info.blue_mask=0x0000001fU;
- }
+ bmp_info.alpha_mask=(image->matte ? 0xff000000U : 0U);
+ bmp_info.red_mask=0x00ff0000U;
+ bmp_info.green_mask=0x0000ff00U;
+ bmp_info.blue_mask=0x000000ffU;
+ if (bmp_info.bits_per_pixel == 16)
+ {
+ // RGB555. JFO: Please consider whether this is correct ?? I guess RGB \
565! + bmp_info.red_mask=0x00007c00U;
+ bmp_info.green_mask=0x000003e0U;
+ bmp_info.blue_mask=0x0000001fU;
}
-*/
+ }
+ */
if ((bmp_info.bits_per_pixel == 16) || (bmp_info.bits_per_pixel == 32))
{
register magick_uint32_t
sample;
- /* Use defaults fot 40 bytes header and also remember to a culture of \
sloth. */
- if(bmp_info.red_mask==0 && bmp_info.green_mask==0 && \
bmp_info.blue_mask==0 && bmp_info.alpha_mask==0)
- {
- if(bmp_info.bits_per_pixel == 16) /* USE BMP 565 */
- {
- bmp_info.red_mask=0x0000F800U;
- bmp_info.green_mask=0x000007e0U;
- bmp_info.blue_mask=0x0000001fU;
- }
- if(bmp_info.bits_per_pixel == 32)
- {
- bmp_info.alpha_mask=(image->matte ? 0xff000000U : 0U);
- bmp_info.red_mask=0x00ff0000U;
- bmp_info.green_mask=0x0000ff00U;
- bmp_info.blue_mask=0x000000ffU;
- }
- }
+ /* Use defaults for 40 bytes header and also a reminder of a culture of \
sloth. */ + if (bmp_info.red_mask==0 && bmp_info.green_mask==0 && \
bmp_info.blue_mask==0 && bmp_info.alpha_mask==0) + {
+ if (bmp_info.bits_per_pixel == 16) /* USE BMP 565 */
+ {
+ bmp_info.red_mask=0x0000F800U;
+ bmp_info.green_mask=0x000007e0U;
+ bmp_info.blue_mask=0x0000001fU;
+ }
+ if ( bmp_info.bits_per_pixel == 32)
+ {
+ bmp_info.alpha_mask=(image->matte ? 0xff000000U : 0U);
+ bmp_info.red_mask=0x00ff0000U;
+ bmp_info.green_mask=0x0000ff00U;
+ bmp_info.blue_mask=0x000000ffU;
+ }
+ }
/*
Get shift and quantum bits info from bitfield masks.
@@ -1442,7 +1442,7 @@
pixel=(*p++);
pixel|=(*p++) << 8;
red=((pixel & bmp_info.red_mask) << shift.red) >> 16;
- if (quantum_bits.red <= 8) /* TODO: this is ugly, but better \
than nothing. Should be reworked. */ + if (quantum_bits.red <= 8) \
/* TODO: this is ugly, but better than nothing. Should be reworked. */ red|=(red >> \
8);
green=((pixel & bmp_info.green_mask) << shift.green) >> 16;
if (quantum_bits.green <= 8)
diff -r ddabe3fa0039 -r 8eff3224f83c www/Changelog.html
--- a/www/Changelog.html Tue Aug 15 22:53:59 2023 +0200
+++ b/www/Changelog.html Tue Aug 15 17:40:34 2023 -0500
@@ -37,6 +37,18 @@
</div>
<div class="document">
+<p>2023-08-15 Fojtik Jaroslav <<a class="reference external" \
href="mailto:JaFojtik%40yandex.com">JaFojtik<span>@</span>yandex<span>.</span>com</a>></p>
+<blockquote>
+<ul class="simple">
+<li><p>coders/bmp.c Fix reading corruption 16bpp.</p></li>
+</ul>
+</blockquote>
+<p>2023-08-15 Fojtik Jaroslav <<a class="reference external" \
href="mailto:JaFojtik%40yandex.com">JaFojtik<span>@</span>yandex<span>.</span>com</a>></p>
+<blockquote>
+<ul class="simple">
+<li><p>coders/tiff.c Fix compilation problem in MSVC.</p></li>
+</ul>
+</blockquote>
<p>2023-08-15 Bob Friesenhahn <<a class="reference external" \
href="mailto:bfriesen%40simple.dallas.tx.us">bfriesen<span> \
4;</span>simple<span>.</span>dallas<span>.</span>tx<span>.</span>us</a>></p>
<blockquote>
<ul class="simple">
_______________________________________________
Graphicsmagick-commit mailing list
Graphicsmagick-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/graphicsmagick-commit
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic