[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] [SCM] Gnash branch, master, updated. 29788d8c2d19aef2f6ae
From: |
Rob Savoye |
Subject: |
[Gnash-commit] [SCM] Gnash branch, master, updated. 29788d8c2d19aef2f6aed70f633d706cd8cc7b36 |
Date: |
Thu, 02 Dec 2010 19:12:21 +0000 |
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnash".
The branch, master has been updated
via 29788d8c2d19aef2f6aed70f633d706cd8cc7b36 (commit)
via 124d3651e327dd0cabafa1779ef958c460d69605 (commit)
from bfeccc873ec7b927581953ef70127abb45d309b5 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit//commit/?id=29788d8c2d19aef2f6aed70f633d706cd8cc7b36
commit 29788d8c2d19aef2f6aed70f633d706cd8cc7b36
Merge: 124d365 bfeccc8
Author: Rob Savoye <address@hidden>
Date: Thu Dec 2 12:12:07 2010 -0700
Merge branch 'master' of git.sv.gnu.org:/srv/git/gnash
http://git.savannah.gnu.org/cgit//commit/?id=124d3651e327dd0cabafa1779ef958c460d69605
commit 124d3651e327dd0cabafa1779ef958c460d69605
Author: Rob Savoye <address@hidden>
Date: Thu Dec 2 12:11:53 2010 -0700
still compile with the older libpng 1.2, cause ltib still uses it, and
upgrading it breaks other packages.
diff --git a/libbase/GnashImagePng.cpp b/libbase/GnashImagePng.cpp
index 98352b0..01f5ef2 100644
--- a/libbase/GnashImagePng.cpp
+++ b/libbase/GnashImagePng.cpp
@@ -161,7 +161,11 @@ PngInput::read()
// Convert less-than-8-bit greyscale to 8 bit.
if (type == PNG_COLOR_TYPE_GRAY && bitDepth < 8) {
log_debug("Setting grey bit depth(%d) to 8", bitDepth);
- png_set_expand_gray_1_2_4_to_8(_pngPtr);
+#if (PNG_LIBPNG_VER_RELEASE < 9)
+ png_set_gray_1_2_4_to_8(_pngPtr);
+#else
+ png_set_expand_gray_1_2_4_to_8(_pngPtr);
+#endif
}
// Apply the transparency block if it exists.
-----------------------------------------------------------------------
Summary of changes:
libbase/GnashImagePng.cpp | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
hooks/post-receive
--
Gnash
- [Gnash-commit] [SCM] Gnash branch, master, updated. 29788d8c2d19aef2f6aed70f633d706cd8cc7b36,
Rob Savoye <=