From 32b8506b2409a01d434dd0ab5024c7718852ebcb Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Sun, 29 Nov 2009 14:53:02 +0000 Subject: Whitespace removal. --- c/src/lib/libbsp/arm/nds/libnds/source/arm9/pcx.c | 170 ++++++++++++++++++++-- 1 file changed, 154 insertions(+), 16 deletions(-) (limited to 'c/src/lib/libbsp/arm/nds/libnds/source/arm9/pcx.c') diff --git a/c/src/lib/libbsp/arm/nds/libnds/source/arm9/pcx.c b/c/src/lib/libbsp/arm/nds/libnds/source/arm9/pcx.c index 6e56011051..0b570476d5 100644 --- a/c/src/lib/libbsp/arm/nds/libnds/source/arm9/pcx.c +++ b/c/src/lib/libbsp/arm/nds/libnds/source/arm9/pcx.c @@ -23,31 +23,169 @@ distribution. $Log$ + Revision 1.1 2008/04/16 18:37:32 joel + 2008-04-16 Matthieu Bucchianeri + + * ChangeLog, Makefile.am, README, bsp_specs, configure.ac, + mk_libnds.sh, patch.libnds, preinstall.am, block/block.c, + clock/clock.c, console/console.c, coproc/coproc.S, coproc/coproc.c, + coproc/coproc.ld, dswifi/dswifi_license.txt, dswifi/makefile, + dswifi/arm7/makefile, dswifi/arm7/source/wifi_arm7.c, + dswifi/arm7/source/wifi_arm7.h, dswifi/arm9/makefile, + dswifi/arm9/source/sgIP.c, dswifi/arm9/source/sgIP.h, + dswifi/arm9/source/sgIP_ARP.c, dswifi/arm9/source/sgIP_ARP.h, + dswifi/arm9/source/sgIP_Config.h, dswifi/arm9/source/sgIP_DHCP.c, + dswifi/arm9/source/sgIP_DHCP.h, dswifi/arm9/source/sgIP_DNS.c, + dswifi/arm9/source/sgIP_DNS.h, dswifi/arm9/source/sgIP_Hub.c, + dswifi/arm9/source/sgIP_Hub.h, dswifi/arm9/source/sgIP_ICMP.c, + dswifi/arm9/source/sgIP_ICMP.h, dswifi/arm9/source/sgIP_IP.c, + dswifi/arm9/source/sgIP_IP.h, dswifi/arm9/source/sgIP_TCP.c, + dswifi/arm9/source/sgIP_TCP.h, dswifi/arm9/source/sgIP_UDP.c, + dswifi/arm9/source/sgIP_UDP.h, dswifi/arm9/source/sgIP_memblock.c, + dswifi/arm9/source/sgIP_memblock.h, + dswifi/arm9/source/sgIP_sockets.c, dswifi/arm9/source/sgIP_sockets.h, + dswifi/arm9/source/wifi_arm9.c, dswifi/arm9/source/wifi_arm9.h, + dswifi/common/source/dsregs.h, dswifi/common/source/spinlock.h, + dswifi/common/source/spinlock.s, dswifi/common/source/wifi_shared.h, + dswifi/include/dswifi7.h, dswifi/include/dswifi9.h, + dswifi/include/dswifi_version.h, dswifi/include/netdb.h, + dswifi/include/sgIP_errno.h, dswifi/include/netinet/in.h, fb/fb.c, + fb/fb.h, include/bsp.h, include/my_ipc.h, include/tm27.h, + include/types.h, include/sys/iosupport.h, irq/irq.c, irq/irq.h, + libfat/gba/include/fat.h, libfat/include/fat.h, + libfat/nds/include/fat.h, libfat/source/bit_ops.h, + libfat/source/cache.c, libfat/source/cache.h, libfat/source/common.h, + libfat/source/directory.c, libfat/source/directory.h, + libfat/source/fatdir.c, libfat/source/fatdir.h, + libfat/source/fatfile.c, libfat/source/fatfile.h, + libfat/source/file_allocation_table.c, + libfat/source/file_allocation_table.h, libfat/source/filetime.c, + libfat/source/filetime.h, libfat/source/libfat.c, + libfat/source/mem_allocate.h, libfat/source/partition.c, + libfat/source/partition.h, libfat/source/disc_io/disc.c, + libfat/source/disc_io/disc.h, libfat/source/disc_io/disc_io.h, + libfat/source/disc_io/io_cf_common.c, + libfat/source/disc_io/io_cf_common.h, + libfat/source/disc_io/io_dldi.h, libfat/source/disc_io/io_dldi.s, + libfat/source/disc_io/io_efa2.c, libfat/source/disc_io/io_efa2.h, + libfat/source/disc_io/io_fcsr.c, libfat/source/disc_io/io_fcsr.h, + libfat/source/disc_io/io_m3_common.c, + libfat/source/disc_io/io_m3_common.h, + libfat/source/disc_io/io_m3cf.c, libfat/source/disc_io/io_m3cf.h, + libfat/source/disc_io/io_m3sd.c, libfat/source/disc_io/io_m3sd.h, + libfat/source/disc_io/io_mpcf.c, libfat/source/disc_io/io_mpcf.h, + libfat/source/disc_io/io_njsd.c, libfat/source/disc_io/io_njsd.h, + libfat/source/disc_io/io_nmmc.c, libfat/source/disc_io/io_nmmc.h, + libfat/source/disc_io/io_sc_common.c, + libfat/source/disc_io/io_sc_common.h, + libfat/source/disc_io/io_sccf.c, libfat/source/disc_io/io_sccf.h, + libfat/source/disc_io/io_scsd.c, libfat/source/disc_io/io_scsd.h, + libfat/source/disc_io/io_scsd_s.s, + libfat/source/disc_io/io_sd_common.c, + libfat/source/disc_io/io_sd_common.h, libnds/Makefile.arm7, + libnds/Makefile.arm9, libnds/libnds_license.txt, + libnds/basicARM7/source/defaultARM7.c, + libnds/include/default_font_bin.h, libnds/include/gbfs.h, + libnds/include/nds.h, libnds/include/nds/bios.h, + libnds/include/nds/card.h, libnds/include/nds/dma.h, + libnds/include/nds/interrupts.h, libnds/include/nds/ipc.h, + libnds/include/nds/jtypes.h, libnds/include/nds/memory.h, + libnds/include/nds/registers_alt.h, libnds/include/nds/reload.h, + libnds/include/nds/system.h, libnds/include/nds/timers.h, + libnds/include/nds/arm7/audio.h, libnds/include/nds/arm7/clock.h, + libnds/include/nds/arm7/serial.h, libnds/include/nds/arm7/touch.h, + libnds/include/nds/arm9/background.h, + libnds/include/nds/arm9/boxtest.h, libnds/include/nds/arm9/cache.h, + libnds/include/nds/arm9/console.h, + libnds/include/nds/arm9/exceptions.h, + libnds/include/nds/arm9/image.h, libnds/include/nds/arm9/input.h, + libnds/include/nds/arm9/math.h, libnds/include/nds/arm9/ndsmotion.h, + libnds/include/nds/arm9/pcx.h, libnds/include/nds/arm9/postest.h, + libnds/include/nds/arm9/rumble.h, libnds/include/nds/arm9/sound.h, + libnds/include/nds/arm9/sprite.h, libnds/include/nds/arm9/trig_lut.h, + libnds/include/nds/arm9/video.h, libnds/include/nds/arm9/videoGL.h, + libnds/source/arm7/audio.c, libnds/source/arm7/clock.c, + libnds/source/arm7/microphone.c, libnds/source/arm7/spi.c, + libnds/source/arm7/touch.c, libnds/source/arm7/userSettings.c, + libnds/source/arm9/COS.bin, libnds/source/arm9/COS.s, + libnds/source/arm9/SIN.bin, libnds/source/arm9/SIN.s, + libnds/source/arm9/TAN.bin, libnds/source/arm9/TAN.s, + libnds/source/arm9/boxtest.c, libnds/source/arm9/console.c, + libnds/source/arm9/dcache.s, libnds/source/arm9/default_font.bin, + libnds/source/arm9/default_font.s, + libnds/source/arm9/exceptionHandler.S, + libnds/source/arm9/exceptionHandler.s, + libnds/source/arm9/exceptions.c, libnds/source/arm9/gurumeditation.c, + libnds/source/arm9/icache.s, libnds/source/arm9/image.c, + libnds/source/arm9/initSystem.c, libnds/source/arm9/keys.c, + libnds/source/arm9/ndsmotion.c, libnds/source/arm9/pcx.c, + libnds/source/arm9/rumble.c, libnds/source/arm9/sound.c, + libnds/source/arm9/system.c, libnds/source/arm9/touch.c, + libnds/source/arm9/video.c, libnds/source/arm9/videoGL.c, + libnds/source/common/biosCalls.s, libnds/source/common/card.c, + libnds/source/common/gbfs.c, + libnds/source/common/interruptDispatcher.s, + libnds/source/common/interrupts.c, rtc/rtc.c, sound/sound.c, + sound/sound.h, start/start.S, startup/linkcmds, startup/start.c, + timer/timer.c, tools/Makefile.am, tools/bin2s, tools/bin2s.c, + tools/configure.ac, tools/runtest, + tools/ndstool/include/arm7_sha1_homebrew.h, + tools/ndstool/include/arm7_sha1_nintendo.h, + tools/ndstool/include/banner.h, tools/ndstool/include/bigint.h, + tools/ndstool/include/crc.h, tools/ndstool/include/default_icon.h, + tools/ndstool/include/encryption.h, tools/ndstool/include/header.h, + tools/ndstool/include/hook.h, tools/ndstool/include/little.h, + tools/ndstool/include/loadme.h, tools/ndstool/include/logo.h, + tools/ndstool/include/ndscreate.h, + tools/ndstool/include/ndsextract.h, tools/ndstool/include/ndstool.h, + tools/ndstool/include/ndstree.h, tools/ndstool/include/overlay.h, + tools/ndstool/include/passme.h, tools/ndstool/include/passme_sram.h, + tools/ndstool/include/passme_vhd1.h, + tools/ndstool/include/passme_vhd2.h, tools/ndstool/include/raster.h, + tools/ndstool/include/sha1.h, tools/ndstool/include/types.h, + tools/ndstool/source/arm7_sha1_homebrew.c, + tools/ndstool/source/arm7_sha1_nintendo.c, + tools/ndstool/source/banner.cpp, tools/ndstool/source/bigint.cpp, + tools/ndstool/source/compile_date.c, tools/ndstool/source/crc.cpp, + tools/ndstool/source/default_icon.c, + tools/ndstool/source/encryption.cpp, tools/ndstool/source/header.cpp, + tools/ndstool/source/hook.cpp, tools/ndstool/source/loadme.c, + tools/ndstool/source/logo.cpp, tools/ndstool/source/ndscodes.cpp, + tools/ndstool/source/ndscreate.cpp, + tools/ndstool/source/ndsextract.cpp, + tools/ndstool/source/ndstool.cpp, tools/ndstool/source/ndstree.cpp, + tools/ndstool/source/passme.cpp, tools/ndstool/source/passme_sram.c, + tools/ndstool/source/raster.cpp, tools/ndstool/source/sha1.cpp, + touchscreen/README.reco, touchscreen/parser.c, touchscreen/reco.c, + touchscreen/reco.h, touchscreen/touchscreen.c, + touchscreen/touchscreen.h, wifi/compat.c, wifi/compat.h, wifi/wifi.c: + New files. + Revision 1.9 2007/01/19 14:46:00 wntrmute name anonymous structs and unions for -std=c99 - + Revision 1.8 2005/11/07 04:12:34 dovoto Fixed palette rounding issue - + Revision 1.7 2005/10/11 05:05:26 dovoto Added imageTileData(sImage* img) to allow loading of pcx as sprite data. Updated pcx.c to set image bit per pixel field - + Revision 1.6 2005/08/23 17:06:10 wntrmute converted all endings to unix - + Revision 1.5 2005/08/03 18:08:13 wntrmute *** empty log message *** - + Revision 1.4 2005/08/03 05:18:06 wntrmute tidied formatting - + Revision 1.3 2005/08/03 05:05:59 dovoto added rounding to palette conversion - + Revision 1.2 2005/08/01 23:18:22 wntrmute adjusted headers for logging - + Revision 1.1 2005/07/27 02:20:52 wntrmute add image functions @@ -62,11 +200,11 @@ int loadPCX(unsigned char* pcx, sImage* image) { //--------------------------------------------------------------------------------- //struct rgb {unsigned char b,g,r;}; RGB_24* pal; - + PCXHeader* hdr = (PCXHeader*) pcx; pcx += sizeof(PCXHeader); - + unsigned char c; int size; int count; @@ -77,30 +215,30 @@ int loadPCX(unsigned char* pcx, sImage* image) { image->height = hdr->ymax - hdr->ymin + 1; size = image->width *image->height; - + image->image.data8 = (unsigned char*)malloc(size); image->palette = (unsigned short*)malloc(256 * 2); if(hdr->bitsPerPixel != 8) return 0; - + count = 0; while(count < size) { c = *pcx++; - + if(c < 192) { image->image.data8[count++] = c; } else { run = c - 192; - + c = *pcx++; - + for(i = 0; i < run; i++) image->image.data8[count++] = c; } } - + pal = (RGB_24*)(pcx + 1); image->bpp = 8; -- cgit v1.2.3