XQF/xqf
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Apply brightness correction to mapshots

Browse Source 
git-svn-id: http://svn.code.sf.net/p/xqf/code/trunk@656 d2ac09be-c843-0410-8b1f-f8a84130e0ec
This commit is contained in:
Ludwig Nussel 2004-08-18 20:36:05 +00:00 committed by l-n
parent 2779ed8b0a
commit f1315cd715
4 changed files with 37 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
xqf/ChangeLog
View File

@ -1,3 +1,6 @@
Aug 18, 2004: Ludwig Nussel <l-n@users.sourceforge.net>
- Apply brightness correction to mapshots
Aug 17, 2004: Ludwig Nussel <l-n@users.sourceforge.net> Aug 17, 2004: Ludwig Nussel <l-n@users.sourceforge.net>
- Fix usage of AC_ARG_ENABLE (#1010440). Thanks Mike Frysinger for reporting. - Fix usage of AC_ARG_ENABLE (#1010440). Thanks Mike Frysinger for reporting.

35
xqf/src/tga/memtopixmap.c
View File

@ -119,7 +119,7 @@ GdkPixbuf* renderMemToPixbuf(const guchar* mem, size_t len)
} }
void renderMemToGtkPixmap(const guchar* mem, size_t len, void renderMemToGtkPixmap(const guchar* mem, size_t len,
GdkPixmap **pix, GdkBitmap **mask, guint* width, guint* height) GdkPixmap **pix, GdkBitmap **mask, guint* width, guint* height, unsigned char brightness)
{ {
GdkPixbuf* pixbuf = renderMemToPixbuf(mem, len); GdkPixbuf* pixbuf = renderMemToPixbuf(mem, len);
@ -128,9 +128,38 @@ void renderMemToGtkPixmap(const guchar* mem, size_t len,
GdkPixbuf* pixbuf_tmp = NULL; GdkPixbuf* pixbuf_tmp = NULL;
pixbuf_tmp = pixbuf; pixbuf_tmp = pixbuf;
pixbuf = gdk_pixbuf_scale_simple(pixbuf,320,240,GDK_INTERP_TILES); pixbuf = gdk_pixbuf_scale_simple(pixbuf,320,240,GDK_INTERP_TILES);
gdk_pixbuf_render_pixmap_and_mask(pixbuf,pix,mask,0);
*height = gdk_pixbuf_get_height(pixbuf); *height = gdk_pixbuf_get_height(pixbuf);
*width = gdk_pixbuf_get_width(pixbuf); *width = gdk_pixbuf_get_width(pixbuf);
if(brightness && gdk_pixbuf_get_n_channels (pixbuf) >= 3) // brightness correction
{
unsigned x, y;
unsigned w = gdk_pixbuf_get_width (pixbuf);
unsigned h = gdk_pixbuf_get_height (pixbuf);
unsigned rs = gdk_pixbuf_get_rowstride (pixbuf);
unsigned c = gdk_pixbuf_get_n_channels (pixbuf);
unsigned char* p = gdk_pixbuf_get_pixels (pixbuf);
register unsigned tmp;
for(y=0; y < h; ++y)
{
for(x=0; x < w; ++x, p+=c)
{
tmp = p[0] + brightness;
p[0] = (tmp>0xFF)?0xFF:tmp;
tmp = p[1] + brightness;
p[1] = (tmp>0xFF)?0xFF:tmp;
tmp = p[2] + brightness;
p[2] = (tmp>0xFF)?0xFF:tmp;
}
if(x*c<rs)
{
p += (rs - x*c);
}
}
}
gdk_pixbuf_render_pixmap_and_mask(pixbuf,pix,mask,0);
gdk_pixbuf_unref(pixbuf); gdk_pixbuf_unref(pixbuf);
gdk_pixbuf_unref(pixbuf_tmp); gdk_pixbuf_unref(pixbuf_tmp);
} }
@ -227,7 +256,7 @@ int main (int argc, char* argv[])
GdkBitmap* mask = NULL; GdkBitmap* mask = NULL;
guint width = 0, height = 0; guint width = 0, height = 0;
renderMemToGtkPixmap(mem, statbuf.st_size, &pix, &mask, &width, &height); renderMemToGtkPixmap(mem, statbuf.st_size, &pix, &mask, &width, &height, 64);
widget = gtk_pixmap_new(pix, mask); widget = gtk_pixmap_new(pix, mask);
gtk_container_add (GTK_CONTAINER (main_window), widget); gtk_container_add (GTK_CONTAINER (main_window), widget);

2
xqf/src/tga/memtopixmap.h
View File

@ -21,6 +21,6 @@
#define _MEMTOPIXMAP_H_ #define _MEMTOPIXMAP_H_
void renderMemToGtkPixmap(const guchar* mem, size_t len, void renderMemToGtkPixmap(const guchar* mem, size_t len,
GdkPixmap **pix, GdkBitmap **mask, guint* width, guint* height); GdkPixmap **pix, GdkBitmap **mask, guint* width, guint* height, unsigned char brightness);
#endif #endif

2
xqf/src/xqf.c
View File

@ -2198,7 +2198,7 @@ static void server_mapshot_preview_popup_show (guchar *imagedata, size_t len, in
GdkPixmap *pix = NULL; GdkPixmap *pix = NULL;
GdkBitmap *mask = NULL; GdkBitmap *mask = NULL;
renderMemToGtkPixmap(imagedata,len,&pix,&mask,&w,&h); renderMemToGtkPixmap(imagedata,len,&pix,&mask,&w,&h, 64);
if(!pix || !w || !h) if(!pix || !w || !h)
{ {