mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-26 15:02:50 +02:00
Code Issues Packages Projects Releases Wiki Activity

printf, which are unnecessary from pictureviewer.cpp and png.cpp removed

Browse Source 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1761 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Branch: ni/coolstream
Commit: c4514851fe
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2011-10-19 (Wed, 19 Oct 2011)

Origin message was:
------------------
- printf, which are unnecessary from pictureviewer.cpp and png.cpp removed

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1761 e54a6e83-5905-42d5-8d5c-058d10e6a962


------------------
This commit was generated by Migit
This commit is contained in:
Michael Liebmann
2011-10-19 20:28:01 +00:00
parent fed797bc94
commit c795f45ee7
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/driver/pictureviewer/pictureviewer.cpp
View File

@@ -491,7 +491,7 @@ bool CPictureViewer::DisplayLogo (uint64_t channel_id, int posx, int posy, int w
bool ret = false;
sprintf(fname, "%s/%llx.jpg", g_settings.logo_hdd_dir.c_str(), channel_id & 0xFFFFFFFFFFFFULL);
printf("logo file: %s\n", fname);
// printf("logo file: %s\n", fname);
if(access(fname, F_OK))
sprintf(fname, "%s/%llx.gif", g_settings.logo_hdd_dir.c_str(), channel_id & 0xFFFFFFFFFFFFULL);
@@ -553,7 +553,7 @@ fb_pixel_t * CPictureViewer::int_getImage(const std::string & name, int *width,
load_ret = fh->get_pic(name.c_str (), &buffer, &x, &y);
if (load_ret == FH_ERROR_OK)
{
printf("%s: decoded %s, %d x %d \n", mode_str.c_str(), name.c_str(), x, y);
// printf("%s: decoded %s, %d x %d \n", mode_str.c_str(), name.c_str(), x, y);
// resize only getImage
if ((GetImage) && (x != *width || y != *height))
{

2
src/driver/pictureviewer/png.cpp
View File

@@ -74,7 +74,6 @@ int int_png_load(const char *name, unsigned char **buffer, int* xp, int* yp, int
}
// 24bit PNGs with alpha-channel
int_bpp = 4;
printf("##### [png.cpp]: Image: %s, bit_depth: %d, bpp: %d\n", name, bit_depth, *bpp);
// png_set_swap_alpha(png_ptr);
if (png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS))
png_set_tRNS_to_alpha(png_ptr);
@@ -92,7 +91,6 @@ int int_png_load(const char *name, unsigned char **buffer, int* xp, int* yp, int
png_set_gray_to_rgb(png_ptr);
png_set_background(png_ptr, (png_color_16*)&my_background, PNG_BACKGROUND_GAMMA_SCREEN, 0, 1.0);
}
printf("##### [png.cpp]: Image: %s, bit_depth: %d\n", name, bit_depth);
/* this test does not trigger for 8bit-paletted PNGs with newer libpng (1.2.36 at least),
but the data delivered is with alpha channel anyway, so always strip alpha for now
*/