adam/cobm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Some long-pending updates and fixes

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@2100 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
avolkov
2005-12-22 01:16:02 +00:00
parent a1244b26bc
commit d2602bfa19
7 changed files with 58 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/abx/abx2raw.h
+4 -4
View File
@@ -1,16 +1,16 @@
#include <stdint.h> #include <stdint.h>
struct abx_header { struct abx_header {
uint16_t num_frames; uint16_t num_frames __attribute__ ((packed));
uint32_t tot_size __attribute__ ((packed)); uint32_t tot_size __attribute__ ((packed));
uint16_t bufsize __attribute__ ((packed)); uint16_t bufsize __attribute__ ((packed));
uint16_t freq __attribute__ ((packed)); uint16_t freq __attribute__ ((packed));
}; };
struct frame_info { struct frame_info {
uint32_t addr; uint32_t addr __attribute__ ((packed));
uint16_t fsize; // compressed file size uint16_t fsize __attribute__ ((packed)); // compressed file size
uint16_t usize; // uncompressed file size uint16_t usize __attribute__ ((packed)); // uncompressed file size
}; };
#define SQLCH 0x40 // Squelch byte flag #define SQLCH 0x40 // Squelch byte flag
tools/ctconv/ctconv.dsp
+8 -8
View File
@@ -42,7 +42,7 @@ RSC=rc.exe
# PROP Ignore_Export_Lib 0 # PROP Ignore_Export_Lib 0
# PROP Target_Dir "" # PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\src\getopt" /I "." /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "PNG_USE_DLL" /YX /FD /c # ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\src\getopt" /I "." /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
# ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe BSC32=bscmake.exe
@@ -50,7 +50,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo # ADD BSC32 /nologo
LINK32=xilink6.exe LINK32=xilink6.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
# ADD LINK32 kernel32.lib user32.lib advapi32.lib shell32.lib libpng10.lib libz.lib /nologo /subsystem:console /machine:I386 # ADD LINK32 kernel32.lib user32.lib advapi32.lib shell32.lib /nologo /subsystem:console /machine:I386
!ELSEIF "$(CFG)" == "ctconv - Win32 Debug" !ELSEIF "$(CFG)" == "ctconv - Win32 Debug"
@@ -66,7 +66,7 @@ LINK32=xilink6.exe
# PROP Ignore_Export_Lib 0 # PROP Ignore_Export_Lib 0
# PROP Target_Dir "" # PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
# ADD CPP /nologo /MD /W3 /Gm /GX /ZI /Od /I "..\..\src\getopt" /I "." /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "PNG_USE_DLL" /YX /FD /GZ /c # ADD CPP /nologo /MD /W3 /Gm /GX /ZI /Od /I "..\..\src\getopt" /I "." /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
# ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe BSC32=bscmake.exe
@@ -74,7 +74,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo # ADD BSC32 /nologo
LINK32=xilink6.exe LINK32=xilink6.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
# ADD LINK32 kernel32.lib user32.lib advapi32.lib shell32.lib libpng10.lib libz.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept # ADD LINK32 kernel32.lib user32.lib advapi32.lib shell32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
!ENDIF !ENDIF
@@ -95,16 +95,16 @@ SOURCE=.\ctconv.c
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\ctres.h
# End Source File
# Begin Source File
SOURCE=..\..\src\getopt\getopt.c SOURCE=..\..\src\getopt\getopt.c
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\..\src\getopt\getopt.h SOURCE=..\..\src\getopt\getopt.h
# End Source File # End Source File
# Begin Source File
SOURCE=.\strres.h
# End Source File
# End Group # End Group
# End Target # End Target
# End Project # End Project
tools/ctconv/ctmap.sh
+1 -2
View File
@@ -1,9 +1,8 @@
#!/bin/bash #!/bin/sh
if [ $# -gt 1 ]; then if [ $# -gt 1 ]; then
echo "Syntax: ctmap.sh [indir] |sort [>map-file]" echo "Syntax: ctmap.sh [indir] |sort [>map-file]"
echo "Creates a map of colormaps used by various images" echo "Creates a map of colormaps used by various images"
echo "Creates a map of colormaps used by various images"
exit 1 exit 1
elif [ $# -ne 1 ]; then elif [ $# -ne 1 ]; then
INDIR="." INDIR="."
tools/dos-ani/undani.c
+39 -7
View File
@@ -126,6 +126,27 @@ typedef struct
#define PAL_COLORS 0x100 #define PAL_COLORS 0x100
// Palette types
typedef uint8_t channel_t;
typedef struct
{
channel_t r, g, b;
} color_t;
typedef struct
{
uint8_t first;
uint8_t last;
union
{
color_t colors[1];
channel_t chans[3];
} pal;
} colormap_t;
#define DOS_SIG_BITS 6
#if defined(_MSC_VER) #if defined(_MSC_VER)
# pragma pack(pop) # pragma pack(pop)
#endif #endif
@@ -163,6 +184,8 @@ int loadPalette(const char *filename);
int decompressFrames(const index_header_t *); int decompressFrames(const index_header_t *);
int cropFrames(const index_header_t *); int cropFrames(const index_header_t *);
inline channel_t conv_chan(uint8_t c);
inline uint16_t get_16_le(uint16_t* val); inline uint16_t get_16_le(uint16_t* val);
inline uint32_t get_32_le(uint32_t* val); inline uint32_t get_32_le(uint32_t* val);
@@ -1328,7 +1351,9 @@ int loadPalette(const char *filename)
{ {
FILE* in; FILE* in;
size_t inlen; size_t inlen;
uint8_t *buf, *clr; uint8_t *buf;
colormap_t* map;
color_t* clr;
int i; int i;
in = fopen(filename, "rb"); in = fopen(filename, "rb");
@@ -1358,14 +1383,16 @@ int loadPalette(const char *filename)
} }
fclose(in); fclose(in);
map = (colormap_t*)buf;
verbose(2, "%s contains %d palette entries\n", verbose(2, "%s contains %d palette entries\n",
filename, (int)buf[1] - buf[0] + 1); filename, (int)buf[1] - buf[0] + 1);
for (i = buf[0], clr = buf + 2; i <= (int)buf[1]; ++i, clr += 3) for (i = map->first, clr = map->pal.colors; i <= (int)map->last; ++i, ++clr)
{ {
palette[i].red = clr[0] << 2; palette[i].red = conv_chan(clr->r);
palette[i].green = clr[1] << 2; palette[i].green = conv_chan(clr->g);
palette[i].blue = clr[2] << 2; palette[i].blue = conv_chan(clr->b);
} }
free(buf); free(buf);
@@ -1373,12 +1400,17 @@ int loadPalette(const char *filename)
return 0; return 0;
} }
inline channel_t conv_chan(uint8_t c)
{ // this uniformly distributes the lower 'unknown' bits
return (c << (8 - DOS_SIG_BITS)) | (c >> (DOS_SIG_BITS - (8 - DOS_SIG_BITS)));
}
inline uint16_t get_16_le(uint16_t* val) inline uint16_t get_16_le(uint16_t* val)
{ {
return (uint16_t)(((uint8_t*)val)[1]) << 8 | ((uint8_t*)val)[0]; return (uint16_t)(((uint8_t*)val)[1] << 8) | ((uint8_t*)val)[0];
} }
inline uint32_t get_32_le(uint32_t* val) inline uint32_t get_32_le(uint32_t* val)
{ {
return (uint32_t)(((uint16_t*)val)[1]) << 16 | ((uint16_t*)val)[0]; return (uint32_t)(get_16_le((uint16_t*)val + 1) << 16) | get_16_le((uint16_t*)val);
} }
tools/dos-ani/undani.dsp
+2 -2
View File
@@ -50,7 +50,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo # ADD BSC32 /nologo
LINK32=xilink6.exe LINK32=xilink6.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
# ADD LINK32 kernel32.lib user32.lib advapi32.lib shell32.lib libpng10.lib /nologo /subsystem:console /machine:I386 # ADD LINK32 kernel32.lib user32.lib advapi32.lib shell32.lib libpng.lib /nologo /subsystem:console /machine:I386
!ELSEIF "$(CFG)" == "undani - Win32 Debug" !ELSEIF "$(CFG)" == "undani - Win32 Debug"
@@ -74,7 +74,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo # ADD BSC32 /nologo
LINK32=xilink6.exe LINK32=xilink6.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
# ADD LINK32 kernel32.lib user32.lib advapi32.lib shell32.lib libpng10.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept # ADD LINK32 kernel32.lib user32.lib advapi32.lib shell32.lib libpng.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
!ENDIF !ENDIF
tools/dos-fnt/unfont.dsp
+2 -2
View File
@@ -50,7 +50,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo # ADD BSC32 /nologo
LINK32=xilink6.exe LINK32=xilink6.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
# ADD LINK32 kernel32.lib user32.lib advapi32.lib shell32.lib libpng10.lib /nologo /subsystem:console /machine:I386 # ADD LINK32 kernel32.lib user32.lib advapi32.lib shell32.lib libpng.lib /nologo /subsystem:console /machine:I386
!ELSEIF "$(CFG)" == "unfont - Win32 Debug" !ELSEIF "$(CFG)" == "unfont - Win32 Debug"
@@ -74,7 +74,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo # ADD BSC32 /nologo
LINK32=xilink6.exe LINK32=xilink6.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
# ADD LINK32 kernel32.lib user32.lib advapi32.lib shell32.lib libpng10.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept # ADD LINK32 kernel32.lib user32.lib advapi32.lib shell32.lib libpng.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
!ENDIF !ENDIF
tools/lpf2ani/lpf2ani.dsp
+2 -2
View File
@@ -50,7 +50,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo # ADD BSC32 /nologo
LINK32=xilink6.exe LINK32=xilink6.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
# ADD LINK32 kernel32.lib user32.lib advapi32.lib shell32.lib libpng10.lib libz.lib /nologo /subsystem:console /machine:I386 # ADD LINK32 kernel32.lib user32.lib advapi32.lib shell32.lib libpng.lib libz.lib /nologo /subsystem:console /machine:I386
!ELSEIF "$(CFG)" == "lpf2ani - Win32 Debug" !ELSEIF "$(CFG)" == "lpf2ani - Win32 Debug"
@@ -74,7 +74,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo # ADD BSC32 /nologo
LINK32=xilink6.exe LINK32=xilink6.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
# ADD LINK32 kernel32.lib user32.lib advapi32.lib shell32.lib libpng10.lib libz.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept # ADD LINK32 kernel32.lib user32.lib advapi32.lib shell32.lib libpng.lib libz.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
!ENDIF !ENDIF